mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

cpio: Fix symlink-bad-length test for 64-bit [ LIN8-947 ] architectures.

Browse Source 
* src/util.c: Return non-zero exit code if EOF is hit prematurely.

Backport commit:
http://git.savannah.gnu.org/cgit/cpio.git/commit/src/util.c?id=f6a8a2cbd2d5ca40ea94900b55b845dd5ca87328

(From OE-Core rev: 21c9952d269ef2d76c0f8698642cbce8f7d5f796)

Signed-off-by: Jun Zhang <jun.zhang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jun Zhang
2015-10-19 17:41:54 +08:00
committed by Richard Purdie
parent 0ff3fc751f
commit bceb9cb5b4
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
meta/recipes-extended/cpio/cpio-2.11/Fix-symlink-bad-length-test-for-64-bit-architectures.patch Normal file
View File

@@ -0,0 +1,36 @@
From 0e8d8ed494433237cff0ad6c513c40f025005e8c Mon Sep 17 00:00:00 2001
From: Jun Zhang <jun.zhang@windriver.com>
Date: Fri, 16 Oct 2015 10:48:21 +0800
Subject: [PATCH] Fix symlink-bad-length test for 64-bit architectures.
* src/util.c: Return non-zero exit code if EOF is hit prematurely.
Backport commit:
http://git.savannah.gnu.org/cgit/cpio.git/commit/src/util.c?id=f6a8a2cbd2d5ca40ea94900b55b845dd5ca87328
Upstream-Status: Backport
Signed-off-by: Jun Zhang <jun.zhang@windriver.com>
---
src/util.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/util.c b/src/util.c
index 00953d5..b536d82 100644
--- a/src/util.c
+++ b/src/util.c
@@ -206,10 +206,7 @@ tape_fill_input_buffer (int in_des, int num_bytes)
if (input_size < 0)
error (1, errno, _("read error"));
if (input_size == 0)
- {
- error (0, 0, _("premature end of file"));
- exit (1);
- }
+ error (PAXEXIT_FAILURE, 0, _("premature end of file"));
input_bytes += input_size;
}
--
1.9.1

1
meta/recipes-extended/cpio/cpio_2.11.bb
View File

@@ -9,6 +9,7 @@ SRC_URI += "file://remove-gets.patch \
file://fix-memory-overrun.patch \
file://cpio-CVE-2015-1197.patch \
file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
file://Fix-symlink-bad-length-test-for-64-bit-architectures.patch \
"
SRC_URI[md5sum] = "1112bb6c45863468b5496ba128792f6c"