Browse code
glibc - Fix CVE-2017-15670, CVE-2017-15804
Change-Id: I0561a5f3e695f537425eab331f7d7e46903f387f
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4189
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
xiaolin-vmware authored on 2017/11/03 02:01:42Showing 3 changed files
- SPECS/glibc/glibc-fix-CVE-2017-15670.patch
- SPECS/glibc/glibc-fix-CVE-2017-15804.patch
- SPECS/glibc/glibc.spec
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,23 @@ |
| 0 |
+From c369d66e5426a30e4725b100d5cd28e372754f90 Mon Sep 17 00:00:00 2001 |
|
| 1 |
+From: Paul Eggert <eggert@cs.ucla.edu> |
|
| 2 |
+Date: Fri, 20 Oct 2017 18:41:14 +0200 |
|
| 3 |
+Subject: [PATCH] CVE-2017-15670: glob: Fix one-byte overflow [BZ #22320] |
|
| 4 |
+ |
|
| 5 |
+--- |
|
| 6 |
+ ChangeLog | 6 ++++++ |
|
| 7 |
+ NEWS | 4 ++++ |
|
| 8 |
+ posix/glob.c | 2 +- |
|
| 9 |
+ 3 files changed, 11 insertions(+), 1 deletion(-) |
|
| 10 |
+ |
|
| 11 |
+index 076ab2b..15a6c0c 100644 (file) |
|
| 12 |
+--- a/posix/glob.c |
|
| 13 |
+@@ -859,7 +859,7 @@ glob (pattern, flags, errfunc, pglob) |
|
| 14 |
+ *p = '\0'; |
|
| 15 |
+ } |
|
| 16 |
+ else |
|
| 17 |
+- *((char *) mempcpy (newp, dirname + 1, end_name - dirname)) |
|
| 18 |
++ *((char *) mempcpy (newp, dirname + 1, end_name - dirname -1)) |
|
| 19 |
+ = '\0'; |
|
| 20 |
+ user_name = newp; |
|
| 21 |
+ } |
| 0 | 22 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,31 @@ |
| 0 |
+From a159b53fa059947cc2548e3b0d5bdcf7b9630ba8 Mon Sep 17 00:00:00 2001 |
|
| 1 |
+From: Paul Eggert <eggert@cs.ucla.edu> |
|
| 2 |
+Date: Sun, 22 Oct 2017 10:00:57 +0200 |
|
| 3 |
+Subject: [PATCH] glob: Fix buffer overflow during GLOB_TILDE unescaping [BZ |
|
| 4 |
+ #22332] |
|
| 5 |
+ |
|
| 6 |
+--- |
|
| 7 |
+ ChangeLog | 6 ++++++ |
|
| 8 |
+ NEWS | 4 ++++ |
|
| 9 |
+ posix/glob.c | 4 ++-- |
|
| 10 |
+ 3 files changed, 12 insertions(+), 2 deletions(-) |
|
| 11 |
+ |
|
| 12 |
+--- a/posix/glob.c |
|
| 13 |
+@@ -770,11 +770,11 @@ __glob (const char *pattern, int flags, int (*errfunc) (const char *, int), |
|
| 14 |
+ char *p = mempcpy (newp, dirname + 1, |
|
| 15 |
+ unescape - dirname - 1); |
|
| 16 |
+ char *q = unescape; |
|
| 17 |
+- while (*q != '\0') |
|
| 18 |
++ while (q != end_name) |
|
| 19 |
+ {
|
|
| 20 |
+ if (*q == '\\') |
|
| 21 |
+ {
|
|
| 22 |
+- if (q[1] == '\0') |
|
| 23 |
++ if (q + 1 == end_name) |
|
| 24 |
+ {
|
|
| 25 |
+ /* "~fo\\o\\" unescape to user_name "foo\\", |
|
| 26 |
+ but "~fo\\o\\/" unescape to user_name |
|
| 27 |
+-- |
|
| 28 |
+2.9.3 |
|
| 29 |
+ |
| ... | ... |
@@ -6,7 +6,7 @@ |
| 6 | 6 |
Summary: Main C library |
| 7 | 7 |
Name: glibc |
| 8 | 8 |
Version: 2.22 |
| 9 |
-Release: 14%{?dist}
|
|
| 9 |
+Release: 15%{?dist}
|
|
| 10 | 10 |
License: LGPLv2+ |
| 11 | 11 |
URL: http://www.gnu.org/software/libc |
| 12 | 12 |
Group: Applications/System |
| ... | ... |
@@ -39,6 +39,8 @@ Patch14: CVE-2016-4429-sunrpc-Do-not-use-alloca-in-clntudp_ca.patch |
| 39 | 39 |
Patch15: glibc-fix-CVE-2017-1000366.patch |
| 40 | 40 |
#https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d42eed4a044e5e10dfb885cf9891c2518a72a491 |
| 41 | 41 |
Patch16: glibc-fix-CVE-2017-12133.patch |
| 42 |
+Patch17: glibc-fix-CVE-2017-15670.patch |
|
| 43 |
+Patch18: glibc-fix-CVE-2017-15804.patch |
|
| 42 | 44 |
Provides: rtld(GNU_HASH) |
| 43 | 45 |
Requires: filesystem |
| 44 | 46 |
%description |
| ... | ... |
@@ -81,6 +83,8 @@ sed -i 's/\\$$(pwd)/`pwd`/' timezone/Makefile |
| 81 | 81 |
%patch14 -p1 |
| 82 | 82 |
%patch15 -p1 |
| 83 | 83 |
%patch16 -p1 |
| 84 |
+%patch17 -p1 |
|
| 85 |
+%patch18 -p1 |
|
| 84 | 86 |
install -vdm 755 %{_builddir}/%{name}-build
|
| 85 | 87 |
# do not try to explicitly provide GLIBC_PRIVATE versioned libraries |
| 86 | 88 |
%define __find_provides %{_builddir}/%{name}-%{version}/find_provides.sh
|
| ... | ... |
@@ -208,6 +212,8 @@ popd |
| 208 | 208 |
|
| 209 | 209 |
|
| 210 | 210 |
%changelog |
| 211 |
+* Wed Oct 25 2017 Xiaolin Li <xiaolinl@vmware.com> 2.22-15 |
|
| 212 |
+- Fix CVE-2017-15670, CVE-2017-15804 |
|
| 211 | 213 |
* Thu Oct 19 2017 Xiaolin Li <xiaolinl@vmware.com> 2.22-14 |
| 212 | 214 |
- Fix CVE-2017-12133 |
| 213 | 215 |
* Thu Jun 29 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.22-13 |