diff options
Diffstat (limited to 'meta/recipes-extended/cpio/cpio-2.11')
4 files changed, 411 insertions, 0 deletions
diff --git a/meta/recipes-extended/cpio/cpio-2.11/cpio-CVE-2015-1197.patch b/meta/recipes-extended/cpio/cpio-2.11/cpio-CVE-2015-1197.patch new file mode 100644 index 0000000000..b54afb867f --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.11/cpio-CVE-2015-1197.patch | |||
@@ -0,0 +1,154 @@ | |||
1 | Description: CVE-2015-1197 | ||
2 | Apply patch by Vitezslav Cizek of SuSE to fix CVE-2015-1197. | ||
3 | Upstream is dormant or no longer existing. To restore the old | ||
4 | behaviour use --extract-over-symlinks (Closes: #774669) | ||
5 | This issue has been discovered by Alexander Cherepanov. | ||
6 | Author: Vitezslav Cizek <vcizek@suse.cz> | ||
7 | Bug-Debian: https://bugs.debian.org/774669 | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | |||
11 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
12 | |||
13 | --- cpio-2.11+dfsg.orig/doc/cpio.1 | ||
14 | +++ cpio-2.11+dfsg/doc/cpio.1 | ||
15 | @@ -22,6 +22,7 @@ cpio \- copy files to and from archives | ||
16 | [\-\-owner=[user][:.][group]] [\-\-no-preserve-owner] [\-\-message=message] | ||
17 | [\-\-force\-local] [\-\-no\-absolute\-filenames] [\-\-sparse] | ||
18 | [\-\-only\-verify\-crc] [\-\-to\-stdout] [\-\-quiet] [\-\-rsh-command=command] | ||
19 | +[\-\-extract\-over\-symlinks] | ||
20 | [\-\-help] [\-\-version] [pattern...] [< archive] | ||
21 | |||
22 | .B cpio | ||
23 | --- cpio-2.11+dfsg.orig/src/copyin.c | ||
24 | +++ cpio-2.11+dfsg/src/copyin.c | ||
25 | @@ -700,6 +700,51 @@ copyin_link (struct cpio_file_stat *file | ||
26 | free (link_name); | ||
27 | } | ||
28 | |||
29 | + | ||
30 | +static int | ||
31 | +path_contains_symlink(char *path) | ||
32 | +{ | ||
33 | + struct stat st; | ||
34 | + char *slash; | ||
35 | + char *nextslash; | ||
36 | + | ||
37 | + /* we got NULL pointer or empty string */ | ||
38 | + if (!path || !*path) { | ||
39 | + return false; | ||
40 | + } | ||
41 | + | ||
42 | + slash = path; | ||
43 | + | ||
44 | + while ((nextslash = strchr(slash + 1, '/')) != NULL) { | ||
45 | + slash = nextslash; | ||
46 | + *slash = '\0'; | ||
47 | + | ||
48 | + if (lstat(path, &st) != 0) { | ||
49 | + if (errno == ELOOP) { | ||
50 | + /* ELOOP - too many symlinks */ | ||
51 | + *slash = '/'; | ||
52 | + return true; | ||
53 | + } else if (errno == ENOMEM) { | ||
54 | + /* No memory for lstat - terminate */ | ||
55 | + xalloc_die(); | ||
56 | + } else { | ||
57 | + /* cannot lstat path - give up */ | ||
58 | + *slash = '/'; | ||
59 | + return false; | ||
60 | + } | ||
61 | + } | ||
62 | + | ||
63 | + if (S_ISLNK(st.st_mode)) { | ||
64 | + *slash = '/'; | ||
65 | + return true; | ||
66 | + } | ||
67 | + | ||
68 | + *slash = '/'; | ||
69 | + } | ||
70 | + | ||
71 | + return false; | ||
72 | +} | ||
73 | + | ||
74 | static void | ||
75 | copyin_file (struct cpio_file_stat *file_hdr, int in_file_des) | ||
76 | { | ||
77 | @@ -1471,6 +1516,23 @@ process_copy_in () | ||
78 | { | ||
79 | /* Copy the input file into the directory structure. */ | ||
80 | |||
81 | + /* Can we write files over symlinks? */ | ||
82 | + if (!extract_over_symlinks) | ||
83 | + { | ||
84 | + if (path_contains_symlink(file_hdr.c_name)) | ||
85 | + { | ||
86 | + /* skip the file */ | ||
87 | + /* | ||
88 | + fprintf(stderr, "Can't write over symlinks. Skipping %s\n", file_hdr.c_name); | ||
89 | + tape_toss_input (in_file_des, file_hdr.c_filesize); | ||
90 | + tape_skip_padding (in_file_des, file_hdr.c_filesize); | ||
91 | + continue; | ||
92 | + */ | ||
93 | + /* terminate */ | ||
94 | + error (1, 0, _("Can't write over symlinks: %s\n"), file_hdr.c_name); | ||
95 | + } | ||
96 | + } | ||
97 | + | ||
98 | /* Do we need to rename the file? */ | ||
99 | if (rename_flag || rename_batch_file) | ||
100 | { | ||
101 | --- cpio-2.11+dfsg.orig/src/extern.h | ||
102 | +++ cpio-2.11+dfsg/src/extern.h | ||
103 | @@ -95,6 +95,7 @@ extern char input_is_special; | ||
104 | extern char output_is_special; | ||
105 | extern char input_is_seekable; | ||
106 | extern char output_is_seekable; | ||
107 | +extern bool extract_over_symlinks; | ||
108 | extern int (*xstat) (); | ||
109 | extern void (*copy_function) (); | ||
110 | |||
111 | --- cpio-2.11+dfsg.orig/src/global.c | ||
112 | +++ cpio-2.11+dfsg/src/global.c | ||
113 | @@ -187,6 +187,9 @@ bool to_stdout_option = false; | ||
114 | /* The name this program was run with. */ | ||
115 | char *program_name; | ||
116 | |||
117 | +/* Extract files over symbolic links */ | ||
118 | +bool extract_over_symlinks; | ||
119 | + | ||
120 | /* A pointer to either lstat or stat, depending on whether | ||
121 | dereferencing of symlinks is done for input files. */ | ||
122 | int (*xstat) (); | ||
123 | --- cpio-2.11+dfsg.orig/src/main.c | ||
124 | +++ cpio-2.11+dfsg/src/main.c | ||
125 | @@ -57,7 +57,8 @@ enum cpio_options { | ||
126 | FORCE_LOCAL_OPTION, | ||
127 | DEBUG_OPTION, | ||
128 | BLOCK_SIZE_OPTION, | ||
129 | - TO_STDOUT_OPTION | ||
130 | + TO_STDOUT_OPTION, | ||
131 | + EXTRACT_OVER_SYMLINKS | ||
132 | }; | ||
133 | |||
134 | const char *program_authors[] = | ||
135 | @@ -222,6 +223,8 @@ static struct argp_option options[] = { | ||
136 | N_("Create leading directories where needed"), GRID+1 }, | ||
137 | {"no-preserve-owner", NO_PRESERVE_OWNER_OPTION, 0, 0, | ||
138 | N_("Do not change the ownership of the files"), GRID+1 }, | ||
139 | + {"extract-over-symlinks", EXTRACT_OVER_SYMLINKS, 0, 0, | ||
140 | + N_("Force writing over symbolic links"), GRID+1 }, | ||
141 | {"unconditional", 'u', NULL, 0, | ||
142 | N_("Replace all files unconditionally"), GRID+1 }, | ||
143 | {"sparse", SPARSE_OPTION, NULL, 0, | ||
144 | @@ -412,6 +415,10 @@ crc newc odc bin ustar tar (all-caps als | ||
145 | no_chown_flag = true; | ||
146 | break; | ||
147 | |||
148 | + case EXTRACT_OVER_SYMLINKS: /* --extract-over-symlinks */ | ||
149 | + extract_over_symlinks = true; | ||
150 | + break; | ||
151 | + | ||
152 | case 'o': /* Copy-out mode. */ | ||
153 | if (copy_function != 0) | ||
154 | error (PAXEXIT_FAILURE, 0, _("Mode already defined")); | ||
diff --git a/meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch b/meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch new file mode 100644 index 0000000000..89cd3cfa50 --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch | |||
@@ -0,0 +1,220 @@ | |||
1 | cpio: Fix memory overrun on reading improperly created link records | ||
2 | |||
3 | Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> | ||
4 | |||
5 | http://git.savannah.gnu.org/cgit/cpio.git/commit/?id=746f3ff670dcfcdd28fcc990e79cd6fccc7ae48d | ||
6 | |||
7 | * src/copyin.c (get_link_name): New function. | ||
8 | (list_file, copyin_link): use get_link_name | ||
9 | |||
10 | * tests/symlink-bad-length.at: New file. | ||
11 | * tests/symlink-long.at: New file. | ||
12 | * tests/Makefile.am: Add new files. | ||
13 | * tests/testsuite.at: Likewise. | ||
14 | |||
15 | See http://lists.gnu.org/archive/html/bug-cpio/2014-11/msg00007.html | ||
16 | |||
17 | Upstream-Status: Backport | ||
18 | |||
19 | Signed-off-by: Sergey Poznyakoff <gray@gnu.org.ua> | ||
20 | |||
21 | diff -Nurp cpio-2.11.orig/src/copyin.c cpio-2.11/src/copyin.c | ||
22 | --- cpio-2.11.orig/src/copyin.c 2010-02-15 18:02:23.000000000 +0800 | ||
23 | +++ cpio-2.11/src/copyin.c 2014-12-08 13:14:04.355547508 +0800 | ||
24 | @@ -126,6 +126,28 @@ tape_skip_padding (int in_file_des, off_ | ||
25 | } | ||
26 | |||
27 | |||
28 | +static char * | ||
29 | +get_link_name (struct cpio_file_stat *file_hdr, int in_file_des) | ||
30 | +{ | ||
31 | + off_t n = file_hdr->c_filesize + 1; | ||
32 | + char *link_name; | ||
33 | + | ||
34 | + if (n == 0 || n > SIZE_MAX) | ||
35 | + { | ||
36 | + error (0, 0, _("%s: stored filename length too big"), file_hdr->c_name); | ||
37 | + link_name = NULL; | ||
38 | + } | ||
39 | + else | ||
40 | + { | ||
41 | + link_name = xmalloc (n); | ||
42 | + tape_buffered_read (link_name, in_file_des, file_hdr->c_filesize); | ||
43 | + link_name[file_hdr->c_filesize] = '\0'; | ||
44 | + tape_skip_padding (in_file_des, file_hdr->c_filesize); | ||
45 | + } | ||
46 | + return link_name; | ||
47 | +} | ||
48 | + | ||
49 | + | ||
50 | static void | ||
51 | list_file(struct cpio_file_stat* file_hdr, int in_file_des) | ||
52 | { | ||
53 | @@ -136,21 +158,16 @@ list_file(struct cpio_file_stat* file_hd | ||
54 | { | ||
55 | if (archive_format != arf_tar && archive_format != arf_ustar) | ||
56 | { | ||
57 | - char *link_name = NULL; /* Name of hard and symbolic links. */ | ||
58 | - | ||
59 | - link_name = (char *) xmalloc ((unsigned int) file_hdr->c_filesize + 1); | ||
60 | - link_name[file_hdr->c_filesize] = '\0'; | ||
61 | - tape_buffered_read (link_name, in_file_des, file_hdr->c_filesize); | ||
62 | - long_format (file_hdr, link_name); | ||
63 | - free (link_name); | ||
64 | - tape_skip_padding (in_file_des, file_hdr->c_filesize); | ||
65 | - return; | ||
66 | + char *link_name = get_link_name (file_hdr, in_file_des); | ||
67 | + if (link_name) | ||
68 | + { | ||
69 | + long_format (file_hdr, link_name); | ||
70 | + free (link_name); | ||
71 | + } | ||
72 | } | ||
73 | else | ||
74 | - { | ||
75 | long_format (file_hdr, file_hdr->c_tar_linkname); | ||
76 | - return; | ||
77 | - } | ||
78 | + return; | ||
79 | } | ||
80 | else | ||
81 | #endif | ||
82 | @@ -650,10 +667,7 @@ copyin_link(struct cpio_file_stat *file_ | ||
83 | |||
84 | if (archive_format != arf_tar && archive_format != arf_ustar) | ||
85 | { | ||
86 | - link_name = (char *) xmalloc ((unsigned int) file_hdr->c_filesize + 1); | ||
87 | - link_name[file_hdr->c_filesize] = '\0'; | ||
88 | - tape_buffered_read (link_name, in_file_des, file_hdr->c_filesize); | ||
89 | - tape_skip_padding (in_file_des, file_hdr->c_filesize); | ||
90 | + link_name = get_link_name (file_hdr, in_file_des); | ||
91 | } | ||
92 | else | ||
93 | { | ||
94 | diff -Nurp cpio-2.11.orig/tests/Makefile.am cpio-2.11/tests/Makefile.am | ||
95 | --- cpio-2.11.orig/tests/Makefile.am 2010-02-15 18:02:23.000000000 +0800 | ||
96 | +++ cpio-2.11/tests/Makefile.am 2014-12-08 13:14:49.931545727 +0800 | ||
97 | @@ -52,6 +52,8 @@ TESTSUITE_AT = \ | ||
98 | setstat04.at\ | ||
99 | setstat05.at\ | ||
100 | symlink.at\ | ||
101 | + symlink-bad-length.at\ | ||
102 | + symlink-long.at\ | ||
103 | version.at | ||
104 | |||
105 | TESTSUITE = $(srcdir)/testsuite | ||
106 | diff -Nurp cpio-2.11.orig/tests/symlink-bad-length.at cpio-2.11/tests/symlink-bad-length.at | ||
107 | --- cpio-2.11.orig/tests/symlink-bad-length.at 1970-01-01 08:00:00.000000000 +0800 | ||
108 | +++ cpio-2.11/tests/symlink-bad-length.at 2014-12-08 13:17:45.979538847 +0800 | ||
109 | @@ -0,0 +1,49 @@ | ||
110 | +# Process this file with autom4te to create testsuite. -*- Autotest -*- | ||
111 | +# Copyright (C) 2014 Free Software Foundation, Inc. | ||
112 | + | ||
113 | +# This program is free software; you can redistribute it and/or modify | ||
114 | +# it under the terms of the GNU General Public License as published by | ||
115 | +# the Free Software Foundation; either version 3, or (at your option) | ||
116 | +# any later version. | ||
117 | + | ||
118 | +# This program is distributed in the hope that it will be useful, | ||
119 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
120 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
121 | +# GNU General Public License for more details. | ||
122 | + | ||
123 | +# You should have received a copy of the GNU General Public License | ||
124 | +# along with this program; if not, write to the Free Software | ||
125 | +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA | ||
126 | +# 02110-1301 USA. | ||
127 | + | ||
128 | +# Cpio v2.11 did segfault with badly set symlink length. | ||
129 | +# References: | ||
130 | +# http://lists.gnu.org/archive/html/bug-cpio/2014-11/msg00007.html | ||
131 | + | ||
132 | +AT_SETUP([symlink-bad-length]) | ||
133 | +AT_KEYWORDS([symlink-long copyout]) | ||
134 | + | ||
135 | +AT_DATA([ARCHIVE.base64], | ||
136 | +[x3EjAIBAtIEtJy8nAQAAAHRUYW0FAAAADQBGSUxFAABzb21lIGNvbnRlbnQKAMdxIwBgQ/+hLScv | ||
137 | +JwEAAAB0VEhuBQD/////TElOSwAARklMRcdxAAAAAAAAAAAAAAEAAAAAAAAACwAAAAAAVFJBSUxF | ||
138 | +UiEhIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA | ||
139 | +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA | ||
140 | +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA | ||
141 | +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA | ||
142 | +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA | ||
143 | +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA | ||
144 | +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= | ||
145 | +]) | ||
146 | + | ||
147 | +AT_CHECK([ | ||
148 | +base64 -d ARCHIVE.base64 > ARCHIVE || AT_SKIP_TEST | ||
149 | +cpio -ntv < ARCHIVE | ||
150 | +test $? -eq 2 | ||
151 | +], | ||
152 | +[0], | ||
153 | +[-rw-rw-r-- 1 10029 10031 13 Nov 25 13:52 FILE | ||
154 | +],[cpio: LINK: stored filename length too big | ||
155 | +cpio: premature end of file | ||
156 | +]) | ||
157 | + | ||
158 | +AT_CLEANUP | ||
159 | diff -Nurp cpio-2.11.orig/tests/symlink-long.at cpio-2.11/tests/symlink-long.at | ||
160 | --- cpio-2.11.orig/tests/symlink-long.at 1970-01-01 08:00:00.000000000 +0800 | ||
161 | +++ cpio-2.11/tests/symlink-long.at 2014-12-08 13:17:57.219538408 +0800 | ||
162 | @@ -0,0 +1,46 @@ | ||
163 | +# Process this file with autom4te to create testsuite. -*- Autotest -*- | ||
164 | +# Copyright (C) 2014 Free Software Foundation, Inc. | ||
165 | + | ||
166 | +# This program is free software; you can redistribute it and/or modify | ||
167 | +# it under the terms of the GNU General Public License as published by | ||
168 | +# the Free Software Foundation; either version 3, or (at your option) | ||
169 | +# any later version. | ||
170 | + | ||
171 | +# This program is distributed in the hope that it will be useful, | ||
172 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
173 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
174 | +# GNU General Public License for more details. | ||
175 | + | ||
176 | +# You should have received a copy of the GNU General Public License | ||
177 | +# along with this program; if not, write to the Free Software | ||
178 | +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA | ||
179 | +# 02110-1301 USA. | ||
180 | + | ||
181 | +# Cpio v2.11.90 changed the way symlink name is read from archive. | ||
182 | +# References: | ||
183 | +# http://lists.gnu.org/archive/html/bug-cpio/2014-11/msg00007.html | ||
184 | + | ||
185 | +AT_SETUP([symlink-long]) | ||
186 | +AT_KEYWORDS([symlink-long copyout]) | ||
187 | + | ||
188 | +AT_CHECK([ | ||
189 | + | ||
190 | +# len(dirname) > READBUFSIZE | ||
191 | +dirname= | ||
192 | +for i in {1..52}; do | ||
193 | + dirname="xxxxxxxxx/$dirname" | ||
194 | + mkdir "$dirname" | ||
195 | +done | ||
196 | +ln -s "$dirname" x || AT_SKIP_TEST | ||
197 | + | ||
198 | +echo x | cpio -o > ar | ||
199 | +list=`cpio -tv < ar | sed 's|.*-> ||'` | ||
200 | +test "$list" = "$dirname" && echo success || echo fail | ||
201 | +], | ||
202 | +[0], | ||
203 | +[success | ||
204 | +],[2 blocks | ||
205 | +2 blocks | ||
206 | +]) | ||
207 | + | ||
208 | +AT_CLEANUP | ||
209 | diff -Nurp cpio-2.11.orig/tests/testsuite.at cpio-2.11/tests/testsuite.at | ||
210 | --- cpio-2.11.orig/tests/testsuite.at 2010-02-15 18:02:23.000000000 +0800 | ||
211 | +++ cpio-2.11/tests/testsuite.at 2014-12-08 13:15:13.515544805 +0800 | ||
212 | @@ -31,6 +31,8 @@ m4_include([version.at]) | ||
213 | |||
214 | m4_include([inout.at]) | ||
215 | m4_include([symlink.at]) | ||
216 | +m4_include([symlink-bad-length.at]) | ||
217 | +m4_include([symlink-long.at]) | ||
218 | m4_include([interdir.at]) | ||
219 | |||
220 | m4_include([setstat01.at]) | ||
diff --git a/meta/recipes-extended/cpio/cpio-2.11/remove-gets.patch b/meta/recipes-extended/cpio/cpio-2.11/remove-gets.patch new file mode 100644 index 0000000000..b4d113d3a5 --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.11/remove-gets.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it | ||
2 | |||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | Index: cpio-2.11/gnu/stdio.in.h | ||
7 | =================================================================== | ||
8 | --- cpio-2.11.orig/gnu/stdio.in.h 2012-07-04 12:13:43.133066247 -0700 | ||
9 | +++ cpio-2.11/gnu/stdio.in.h 2012-07-04 12:14:10.189067564 -0700 | ||
10 | @@ -138,8 +138,10 @@ | ||
11 | /* It is very rare that the developer ever has full control of stdin, | ||
12 | so any use of gets warrants an unconditional warning. Assume it is | ||
13 | always declared, since it is required by C89. */ | ||
14 | +#if defined gets | ||
15 | #undef gets | ||
16 | _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); | ||
17 | +#endif | ||
18 | |||
19 | #if @GNULIB_FOPEN@ | ||
20 | # if @REPLACE_FOPEN@ | ||
diff --git a/meta/recipes-extended/cpio/cpio-2.11/statdef.patch b/meta/recipes-extended/cpio/cpio-2.11/statdef.patch new file mode 100644 index 0000000000..a6b8e82a0b --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.11/statdef.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | Avoid multiple stat definitions | ||
2 | Patch taken from cpio mailing list posting 2010-03-19 | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
7 | |||
8 | diff -urN cpio-2.11.orig/src/filetypes.h cpio-2.11/src/filetypes.h | ||
9 | --- cpio-2.11.orig/src/filetypes.h 2010-02-12 02:19:23.000000000 -0800 | ||
10 | +++ cpio-2.11/src/filetypes.h 2010-07-23 13:17:25.000000000 -0700 | ||
11 | @@ -82,4 +82,6 @@ | ||
12 | #define lstat stat | ||
13 | #endif | ||
14 | int lstat (); | ||
15 | +#ifndef stat | ||
16 | int stat (); | ||
17 | +#endif | ||