diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2018-07-27 16:04:34 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-30 12:44:35 +0100 |
commit | ffb63803eac6ba97d1b9e1f3d648bc4d81bf0276 (patch) | |
tree | d29c106cf81ae93e47b30aaaf87e10bbcdfc10eb /meta/recipes-extended/shadow/files/0001-shadow-CVE-2017-12424 | |
parent | 96f011e628fe360644bfdd7650145b996d61740c (diff) | |
download | poky-ffb63803eac6ba97d1b9e1f3d648bc4d81bf0276.tar.gz |
shadow: upgrade 4.2.1 -> 4.6
The following patches are removed because problems have been fixed in this version.
0001-shadow-CVE-2017-12424
fix-installation-failure-with-subids-disabled.patch
usermod-fix-compilation-failure-with-subids-disabled.patch
CVE-2017-2616.patch
check_size_of_uid_t_and_gid_t_using_AC_CHECK_SIZEOF.patch
0001-Do-not-read-login.defs-before-doing-chroot.patch
The following patches are rebased.
0001-Disable-use-of-syslog-for-sysroot.patch
0001-useradd-copy-extended-attributes-of-home.patch
0001-useradd.c-create-parent-directories-when-necessary.patch
allow-for-setting-password-in-clear-text.patch
(From OE-Core rev: 79dd22729d5b8a2f2cf4294ff6b261c9d6ecd977)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/shadow/files/0001-shadow-CVE-2017-12424')
-rw-r--r-- | meta/recipes-extended/shadow/files/0001-shadow-CVE-2017-12424 | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/meta/recipes-extended/shadow/files/0001-shadow-CVE-2017-12424 b/meta/recipes-extended/shadow/files/0001-shadow-CVE-2017-12424 deleted file mode 100644 index 4d3e1e016c..0000000000 --- a/meta/recipes-extended/shadow/files/0001-shadow-CVE-2017-12424 +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From 954e3d2e7113e9ac06632aee3c69b8d818cc8952 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tomas Mraz <tmraz@fedoraproject.org> | ||
3 | Date: Fri, 31 Mar 2017 16:25:06 +0200 | ||
4 | Subject: [PATCH] Fix buffer overflow if NULL line is present in db. | ||
5 | |||
6 | If ptr->line == NULL for an entry, the first cycle will exit, | ||
7 | but the second one will happily write past entries buffer. | ||
8 | We actually do not want to exit the first cycle prematurely | ||
9 | on ptr->line == NULL. | ||
10 | Signed-off-by: Tomas Mraz <tmraz@fedoraproject.org> | ||
11 | |||
12 | CVE: CVE-2017-12424 | ||
13 | Upstream-Status: Backport | ||
14 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
15 | --- | ||
16 | lib/commonio.c | 8 ++++---- | ||
17 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
18 | |||
19 | diff --git a/lib/commonio.c b/lib/commonio.c | ||
20 | index b10da06..31edbaa 100644 | ||
21 | --- a/lib/commonio.c | ||
22 | +++ b/lib/commonio.c | ||
23 | @@ -751,16 +751,16 @@ commonio_sort (struct commonio_db *db, int (*cmp) (const void *, const void *)) | ||
24 | for (ptr = db->head; | ||
25 | (NULL != ptr) | ||
26 | #if KEEP_NIS_AT_END | ||
27 | - && (NULL != ptr->line) | ||
28 | - && ( ('+' != ptr->line[0]) | ||
29 | - && ('-' != ptr->line[0])) | ||
30 | + && ((NULL == ptr->line) | ||
31 | + || (('+' != ptr->line[0]) | ||
32 | + && ('-' != ptr->line[0]))) | ||
33 | #endif | ||
34 | ; | ||
35 | ptr = ptr->next) { | ||
36 | n++; | ||
37 | } | ||
38 | #if KEEP_NIS_AT_END | ||
39 | - if ((NULL != ptr) && (NULL != ptr->line)) { | ||
40 | + if (NULL != ptr) { | ||
41 | nis = ptr; | ||
42 | } | ||
43 | #endif | ||
44 | -- | ||
45 | 2.1.0 | ||
46 | |||