Change-Id: Ib7b63ea4d2088584f9bcbf40da4ea30bd99f79d7
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5177
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George
1 | 1 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,25 @@ |
0 |
+--- a/Src/utils.c |
|
1 |
+@@ -1653,7 +1653,7 @@ |
|
2 |
+ LinkList l; |
|
3 |
+ DIR *lock = opendir(unmeta(*s)); |
|
4 |
+ char buf[PATH_MAX * 2 + 1], **arr, **ap; |
|
5 |
+- int ct = 1; |
|
6 |
++ int buflen, ct = 1; |
|
7 |
+ |
|
8 |
+ if (lock) { |
|
9 |
+ char *fn; |
|
10 |
+@@ -1654,9 +1654,11 @@ checkmailpath(char **s) |
|
11 |
+ l = newlinklist(); |
|
12 |
+ while ((fn = zreaddir(lock, 1)) && !errflag) { |
|
13 |
+ if (u) |
|
14 |
+- sprintf(buf, "%s/%s?%s", *s, fn, u); |
|
15 |
++ buflen = snprintf(buf, sizeof(buf), "%s/%s?%s", *s, fn, u); |
|
16 |
+ else |
|
17 |
+- sprintf(buf, "%s/%s", *s, fn); |
|
18 |
++ buflen = snprintf(buf, sizeof(buf), "%s/%s", *s, fn); |
|
19 |
++ if (buflen < 0 || buflen >= (int)sizeof(buf)) |
|
20 |
++ continue; |
|
21 |
+ addlinknode(l, dupstring(buf)); |
|
22 |
+ ct++; |
|
23 |
+ } |
... | ... |
@@ -3,7 +3,7 @@ |
3 | 3 |
Summary: Z shell |
4 | 4 |
Name: zsh |
5 | 5 |
Version: 5.3.1 |
6 |
-Release: 7%{?dist} |
|
6 |
+Release: 8%{?dist} |
|
7 | 7 |
License: MIT |
8 | 8 |
URL: http://zsh.sourceforge.net/ |
9 | 9 |
Group: System Environment/Shells |
... | ... |
@@ -16,6 +16,7 @@ Source2: zshrc |
16 | 16 |
Patch0: zsh-CVE-2018-7548.patch |
17 | 17 |
Patch1: zsh-CVE-2018-7549.patch |
18 | 18 |
Patch2: zsh-CVE-2018-1083.patch |
19 |
+Patch3: zsh-CVE-2018-1100.patch |
|
19 | 20 |
|
20 | 21 |
BuildRequires: coreutils |
21 | 22 |
BuildRequires: tar |
... | ... |
@@ -64,6 +65,7 @@ This package contains the Zsh manual in html format. |
64 | 64 |
%patch0 -p1 |
65 | 65 |
%patch1 -p1 |
66 | 66 |
%patch2 -p1 |
67 |
+%patch3 -p1 |
|
67 | 68 |
|
68 | 69 |
%build |
69 | 70 |
# make loading of module's dependencies work again (#1277996) |
... | ... |
@@ -150,6 +152,8 @@ fi |
150 | 150 |
%doc Doc/*.html |
151 | 151 |
|
152 | 152 |
%changelog |
153 |
+* Mon May 21 2018 Xiaolin Li <xiaolinl@vmware.com> 5.3.1-8 |
|
154 |
+- Fix CVE-2018-1100 |
|
153 | 155 |
* Tue Apr 24 2018 Xiaolin Li <xiaolinl@vmware.com> 5.3.1-7 |
154 | 156 |
- Fix CVE-2018-1083 |
155 | 157 |
* Tue Apr 17 2018 Xiaolin Li <xiaolinl@vmware.com> 5.3.1-6 |