On Thu, 2021-04-29 at 04:30 -0700, Vinay Kumar wrote:

Source: git://sourceware.org/git/binutils-gdb.git
Tracking -- https://sourceware.org/bugzilla/show_bug.cgi?id=26945

Backported upstream commit d3edaa91d4cf7202ec14342410194841e2f67f12 to
binutils-2.36 source along with commit id dependencies
(8e03235147a9e774d3ba084e93c2da1aa94d1cec and
8b69e61d4be276bb862698aaafddc3e779d23c8f).

Upstream-Status: Backport [
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=d3edaa91d4cf7202ec14342410194841e2f67f12
]

Signed-off-by: Vinay Kumar <redacted>
---
This patch is verified by building both Linux and Mingw toolchains for
ARM target, and executed "binutils" regresssion testing.

 .../binutils/binutils-2.36.inc                |   1 +
 .../binutils/binutils/CVE-2021-20197.patch    | 388 ++++++++++++++++++
 2 files changed, 389 insertions(+)

This doesn't look like a cherry pick of:

https://github.com/bminor/binutils-gdb/commit/d3edaa91d4cf7202ec14342410194841e2f67f12

What else is in there? 

Also this didn't apply on hardknott and I had to rebase it. Please also
use b in the subject for binutils.

Thanks,

Anuj

+ #include "sysdep.h"
+ #include "bfd.h"
+-#include "libbfd.h"
+ #include "progress.h"
+ #include "getopt.h"
+ #include "libiberty.h"
+@@ -4861,12 +4860,10 @@ strip_main (int argc, char *argv[])
+                output_target, NULL);
+       if (status == 0)
+       {
+-        if (preserve_dates)
+-          set_times (tmpname, &statbuf);
+         if (output_file != tmpname)
+           status = (smart_rename (tmpname,
+                                   output_file ? output_file :
argv[i],
+-                                  preserve_dates) != 0);
++                                  preserve_dates ? &statbuf : NULL)
!= 0);
+         if (status == 0)
+           status = hold_status;
+       }
+@@ -5931,11 +5928,9 @@ copy_main (int argc, char *argv[])
+            output_target, input_arch);
+   if (status == 0)
+     {
+-      if (preserve_dates)
+-      set_times (tmpname, &statbuf);
+       if (tmpname != output_filename)
+       status = (smart_rename (tmpname, input_filename,
+-                              preserve_dates) != 0);
++                              preserve_dates ? &statbuf : NULL) !=
0);
+     }
+   else
+     unlink_if_ordinary (tmpname);
+diff --git a/binutils/rename.c b/binutils/rename.c
+index 65ad5bf52c4..72a9323d72c 100644
+--- a/binutils/rename.c
++++ b/binutils/rename.c
+@@ -24,14 +24,9 @@
+ 
+ #ifdef HAVE_GOOD_UTIME_H
+ #include <utime.h>
+-#else /* ! HAVE_GOOD_UTIME_H */
+-#ifdef HAVE_UTIMES
++#elif defined HAVE_UTIMES
+ #include <sys/time.h>
+-#endif /* HAVE_UTIMES */
+-#endif /* ! HAVE_GOOD_UTIME_H */
+-
+-#if ! defined (_WIN32) || defined (__CYGWIN32__)
+-static int simple_copy (const char *, const char *);
++#endif
+ 
+ /* The number of bytes to copy at once.  */
+ #define COPY_BUF 8192
+@@ -82,7 +77,6 @@ simple_copy (const char *from, const char *to)
+     }
+   return 0;
+ }
+-#endif /* __CYGWIN32__ or not _WIN32 */
+ 
+ /* Set the times of the file DESTINATION to be the same as those in
+    STATBUF.  */
+@@ -91,122 +85,52 @@ void
+ set_times (const char *destination, const struct stat *statbuf)
+ {
+   int result;
+-
+-  {
+ #ifdef HAVE_GOOD_UTIME_H
+-    struct utimbuf tb;
+-
+-    tb.actime = statbuf->st_atime;
+-    tb.modtime = statbuf->st_mtime;
+-    result = utime (destination, &tb);
+-#else /* ! HAVE_GOOD_UTIME_H */
+-#ifndef HAVE_UTIMES
+-    long tb[2];
+-
+-    tb[0] = statbuf->st_atime;
+-    tb[1] = statbuf->st_mtime;
+-    result = utime (destination, tb);
+-#else /* HAVE_UTIMES */
+-    struct timeval tv[2];
+-
+-    tv[0].tv_sec = statbuf->st_atime;
+-    tv[0].tv_usec = 0;
+-    tv[1].tv_sec = statbuf->st_mtime;
+-    tv[1].tv_usec = 0;
+-    result = utimes (destination, tv);
+-#endif /* HAVE_UTIMES */
+-#endif /* ! HAVE_GOOD_UTIME_H */
+-  }
++  struct utimbuf tb;
++
++  tb.actime = statbuf->st_atime;
++  tb.modtime = statbuf->st_mtime;
++  result = utime (destination, &tb);
++#elif defined HAVE_UTIMES
++  struct timeval tv[2];
++
++  tv[0].tv_sec = statbuf->st_atime;
++  tv[0].tv_usec = 0;
++  tv[1].tv_sec = statbuf->st_mtime;
++  tv[1].tv_usec = 0;
++  result = utimes (destination, tv);
++#else
++  long tb[2];
++
++  tb[0] = statbuf->st_atime;
++  tb[1] = statbuf->st_mtime;
++  result = utime (destination, tb);
++#endif
+ 
+   if (result != 0)
+     non_fatal (_("%s: cannot set time: %s"), destination, strerror
(errno));
+ }
+ 
+-#ifndef S_ISLNK
+-#ifdef S_IFLNK
+-#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
+-#else
+-#define S_ISLNK(m) 0
+-#define lstat stat
+-#endif
+-#endif
+-
+-/* Rename FROM to TO, copying if TO is a link.
+-   Return 0 if ok, -1 if error.  */
++/* Copy FROM to TO.  TARGET_STAT has the file status that, if non-
NULL,
++   is used to fix up timestamps.  Return 0 if ok, -1 if error.
++   At one time this function renamed files, but file permissions are
++   tricky to update given the number of different schemes used by
++   various systems.  So now we just copy.  */
+ 
+ int
+-smart_rename (const char *from, const char *to, int preserve_dates
ATTRIBUTE_UNUSED)
++smart_rename (const char *from, const char *to,
++            struct stat *target_stat)
+ {
+-  bfd_boolean exists;
+-  struct stat s;
+-  int ret = 0;
+-
+-  exists = lstat (to, &s) == 0;
+-
+-#if defined (_WIN32) && !defined (__CYGWIN32__)
+-  /* Win32, unlike unix, will not erase `to' in `rename(from, to)'
but
+-     fail instead.  Also, chown is not present.  */
++  int ret;
+ 
+-  if (exists)
+-    remove (to);
+-
+-  ret = rename (from, to);
++  ret = simple_copy (from, to);
+   if (ret != 0)
+-    {
+-      /* We have to clean up here.  */
+-      non_fatal (_("unable to rename '%s'; reason: %s"), to, strerror
(errno));
+-      unlink (from);
+-    }
+-#else
+-  /* Use rename only if TO is not a symbolic link and has
+-     only one hard link, and we have permission to write to it.  */
+-  if (! exists
+-      || (!S_ISLNK (s.st_mode)
+-        && S_ISREG (s.st_mode)
+-        && (s.st_mode & S_IWUSR)
+-        && s.st_nlink == 1)
+-      )
+-    {
+-      ret = rename (from, to);
+-      if (ret == 0)
+-      {
+-        if (exists)
+-          {
+-            /* Try to preserve the permission bits and ownership of
+-               TO.  First get the mode right except for the setuid
+-               bit.  Then change the ownership.  Then fix the setuid
+-               bit.  We do the chmod before the chown because if the
+-               chown succeeds, and we are a normal user, we won't be
+-               able to do the chmod afterward.  We don't bother to
+-               fix the setuid bit first because that might introduce
+-               a fleeting security problem, and because the chown
+-               will clear the setuid bit anyhow.  We only fix the
+-               setuid bit if the chown succeeds, because we don't
+-               want to introduce an unexpected setuid file owned by
+-               the user running objcopy.  */
+-            chmod (to, s.st_mode & 0777);
+-            if (chown (to, s.st_uid, s.st_gid) >= 0)
+-              chmod (to, s.st_mode & 07777);
+-          }
+-      }
+-      else
+-      {
+-        /* We have to clean up here.  */
+-        non_fatal (_("unable to rename '%s'; reason: %s"), to,
strerror (errno));
+-        unlink (from);
+-      }
+-    }
+-  else
+-    {
+-      ret = simple_copy (from, to);
+-      if (ret != 0)
+-      non_fatal (_("unable to copy file '%s'; reason: %s"), to,
strerror (errno));
++    non_fatal (_("unable to copy file '%s'; reason: %s"),
++             to, strerror (errno));
+ 
+-      if (preserve_dates)
+-      set_times (to, &s);
+-      unlink (from);
+-    }
+-#endif /* _WIN32 && !__CYGWIN32__ */
++  if (target_stat != NULL)
++    set_times (to, target_stat);
++  unlink (from);
+ 
+   return ret;
+ }
+-- 
+2.17.1
+