Patchwork tar: apply fedora patch for fortify sources sigabort

login
register
mail settings
Submitter Fahad Usman
Date Dec. 12, 2012, 1:01 p.m.
Message ID <1355317292-25318-1-git-send-email-fahad_usman@mentor.com>
Download mbox | patch
Permalink /patch/40811/
State Accepted
Commit 5693f3e15850cdb05bafb178d92df1aa8e196fe9
Headers show

Comments

Fahad Usman - Dec. 12, 2012, 1:01 p.m.
See https://qa.mandriva.com/show_bug.cgi?id=61419 for details.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>

the patch was imported from meta-mentor layer on yoctoproject git server
http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor as of commit id
333d2e0510a1e052cb83a6f8beed6d8bcea59b2c

Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
---
 .../tar-1.26/tar-1.26-fortifysourcessigabrt.patch  |   36 ++++++++++++++++++++
 meta/recipes-extended/tar/tar_1.26.bb              |    3 +-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-extended/tar/tar-1.26/tar-1.26-fortifysourcessigabrt.patch

Patch

diff --git a/meta/recipes-extended/tar/tar-1.26/tar-1.26-fortifysourcessigabrt.patch b/meta/recipes-extended/tar/tar-1.26/tar-1.26-fortifysourcessigabrt.patch
new file mode 100644
index 0000000..6aef096
--- /dev/null
+++ b/meta/recipes-extended/tar/tar-1.26/tar-1.26-fortifysourcessigabrt.patch
@@ -0,0 +1,36 @@ 
+port fedora patch for fortify sources sigabort. See 
+https://qa.mandriva.com/show_bug.cgi?id=61419 for details.
+
+Upstream-Status: Pending
+
+Signed-off-by: Christopher Larson <chris_larson@mentor.com>
+Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
+
+---
+ src/create.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- tar-1.26.orig/src/create.c
++++ tar-1.26/src/create.c
+@@ -562,8 +562,8 @@ write_gnu_long_link (struct tar_stat_inf
+   GNAME_TO_CHARS (tmpname, header->header.gname);
+   free (tmpname);
+
+-  strcpy (header->buffer + offsetof (struct posix_header, magic),
+-	  OLDGNU_MAGIC);
++  strncpy (header->buffer + offsetof (struct posix_header, magic),
++	  OLDGNU_MAGIC, sizeof(header->header.magic));
+   header->header.typeflag = type;
+   finish_header (st, header, -1);
+
+@@ -900,8 +900,8 @@ start_header (struct tar_stat_info *st)
+     case OLDGNU_FORMAT:
+     case GNU_FORMAT:   /*FIXME?*/
+       /* Overwrite header->header.magic and header.version in one blow.  */
+-      strcpy (header->buffer + offsetof (struct posix_header, magic),
+-	      OLDGNU_MAGIC);
++      strncpy (header->buffer + offsetof (struct posix_header, magic),
++	      OLDGNU_MAGIC, sizeof(header->header.magic));
+       break;
+
+     case POSIX_FORMAT:
diff --git a/meta/recipes-extended/tar/tar_1.26.bb b/meta/recipes-extended/tar/tar_1.26.bb
index 03a35c3..d45c2b1 100644
--- a/meta/recipes-extended/tar/tar_1.26.bb
+++ b/meta/recipes-extended/tar/tar_1.26.bb
@@ -3,9 +3,10 @@  require tar.inc
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI += "file://remove-gets.patch \
+           file://tar-1.26-fortifysourcessigabrt.patch\
            "
 
 SRC_URI[md5sum] = "2cee42a2ff4f1cd4f9298eeeb2264519"