63079c3
Subject: [PATCH 2/7] set exit code to 1 when cpio fails to store file > 4GB
63079c3
 (#183224)
63079c3
63079c3
diff --git a/src/copyout.c b/src/copyout.c
955b315
index fa999bd..6e82f4c 100644
63079c3
--- a/src/copyout.c
63079c3
+++ b/src/copyout.c
955b315
@@ -287,7 +287,7 @@ field_width_error (const char *filename, const char *fieldname,
63079c3
 {
63079c3
   char valbuf[UINTMAX_STRSIZE_BOUND + 1];
63079c3
   char maxbuf[UINTMAX_STRSIZE_BOUND + 1];
63079c3
-  error (0, 0, _("%s: value %s %s out of allowed range 0..%s"),
63079c3
+  error (1, 0, _("%s: value %s %s out of allowed range 0..%s"),
63079c3
 	 filename, fieldname,
63079c3
 	 STRINGIFY_BIGINT (value, valbuf),
63079c3
 	 STRINGIFY_BIGINT (MAX_VAL_WITH_DIGITS (width - nul, LG_8),
63079c3
diff --git a/tests/CVE-2019-14866.at b/tests/CVE-2019-14866.at
955b315
index 530365a..5a4e15c 100644
63079c3
--- a/tests/CVE-2019-14866.at
63079c3
+++ b/tests/CVE-2019-14866.at
63079c3
@@ -30,6 +30,5 @@ fi
63079c3
 [0],
63079c3
 [],
63079c3
 [cpio: file: value size 17179869184 out of allowed range 0..8589934591
63079c3
-2 blocks
63079c3
 ])
63079c3
 AT_CLEANUP
63079c3
diff --git a/tests/testsuite b/tests/testsuite
955b315
index 10531d1..d69dad9 100755
63079c3
--- a/tests/testsuite
63079c3
+++ b/tests/testsuite
955b315
@@ -2927,7 +2927,6 @@ fi
63079c3
 at_status=$? at_failed=false
63079c3
 $at_check_filter
955b315
 echo >>"$at_stderr"; printf "%s\n" "cpio: file: value size 17179869184 out of allowed range 0..8589934591
63079c3
-2 blocks
63079c3
 " | \
63079c3
   $at_diff - "$at_stderr" || at_failed=:
63079c3
 at_fn_diff_devnull "$at_stdout" || at_failed=: