tar: apply fedora patch for fortify sources sigabort

See https://qa.mandriva.com/show_bug.cgi?id=61419 for details.

(From OE-Core rev: 648cda68def82fa12b3af599c06caecdc7568668)

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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Fahad Usman 2012-12-12 18:01:32 +05:00 committed by Richard Purdie
parent db07a94e0f
commit 5693f3e158
2 changed files with 38 additions and 1 deletions

View File

@ -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:

View File

@ -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"