|
 |
5c2053 |
Subject: [PATCH 2/7] set exit code to 1 when cpio fails to store file > 4GB
|
|
|
5c2053 |
(#183224)
|
|
|
5c2053 |
|
|
|
5c2053 |
diff --git a/src/copyout.c b/src/copyout.c
|
|
|
5c2053 |
index 8b0beb6..4b7336b 100644
|
|
|
5c2053 |
--- a/src/copyout.c
|
|
|
5c2053 |
+++ b/src/copyout.c
|
|
|
5c2053 |
@@ -290,7 +290,7 @@ field_width_error (const char *filename, const char *fieldname,
|
|
|
5c2053 |
{
|
|
|
5c2053 |
char valbuf[UINTMAX_STRSIZE_BOUND + 1];
|
|
|
5c2053 |
char maxbuf[UINTMAX_STRSIZE_BOUND + 1];
|
|
|
5c2053 |
- error (0, 0, _("%s: value %s %s out of allowed range 0..%s"),
|
|
|
5c2053 |
+ error (1, 0, _("%s: value %s %s out of allowed range 0..%s"),
|
|
|
5c2053 |
filename, fieldname,
|
|
|
5c2053 |
STRINGIFY_BIGINT (value, valbuf),
|
|
|
5c2053 |
STRINGIFY_BIGINT (MAX_VAL_WITH_DIGITS (width - nul, LG_8),
|
|
|
5c2053 |
diff --git a/tests/CVE-2019-14866.at b/tests/CVE-2019-14866.at
|
|
|
5c2053 |
index e877b39..50ad60b 100644
|
|
|
5c2053 |
--- a/tests/CVE-2019-14866.at
|
|
|
5c2053 |
+++ b/tests/CVE-2019-14866.at
|
|
|
5c2053 |
@@ -30,6 +30,5 @@ fi
|
|
|
5c2053 |
[0],
|
|
|
5c2053 |
[],
|
|
|
5c2053 |
[cpio: file: value size 17179869184 out of allowed range 0..8589934591
|
|
|
5c2053 |
-2 blocks
|
|
|
5c2053 |
])
|
|
|
5c2053 |
AT_CLEANUP
|
|
|
5c2053 |
diff --git a/tests/testsuite b/tests/testsuite
|
|
|
5c2053 |
index b45c731..fd8454d 100755
|
|
|
5c2053 |
--- a/tests/testsuite
|
|
|
5c2053 |
+++ b/tests/testsuite
|
|
|
5c2053 |
@@ -2885,7 +2885,6 @@ fi
|
|
|
5c2053 |
at_status=$? at_failed=false
|
|
|
5c2053 |
$at_check_filter
|
|
|
5c2053 |
echo >>"$at_stderr"; $as_echo "cpio: file: value size 17179869184 out of allowed range 0..8589934591
|
|
|
5c2053 |
-2 blocks
|
|
|
5c2053 |
" | \
|
|
|
5c2053 |
$at_diff - "$at_stderr" || at_failed=:
|
|
|
5c2053 |
at_fn_diff_devnull "$at_stdout" || at_failed=:
|