Browse code
Apply patch for CVE-2018-6952 in patch-2.7.5
Change-Id: I4d2fd67c99db59693d506f5eec661d7e673f6b65
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5884
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
gsujayvmw authored on 2018/10/08 20:37:13Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,13 @@ |
| 0 |
+diff --git a/src/pch.c b/src/pch.c |
|
| 1 |
+index e92bc64..a500ad9 100644 |
|
| 2 |
+--- a/src/pch.c |
|
| 3 |
+@@ -2122,7 +2122,7 @@ pch_swap (void) |
|
| 4 |
+ } |
|
| 5 |
+ if (p_efake >= 0) { /* fix non-freeable ptr range */
|
|
| 6 |
+ if (p_efake <= i) |
|
| 7 |
+- n = p_end - i + 1; |
|
| 8 |
++ n = p_end - p_ptrn_lines; |
|
| 9 |
+ else |
|
| 10 |
+ n = -i; |
|
| 11 |
+ p_efake += n; |
| ... | ... |
@@ -1,13 +1,14 @@ |
| 1 | 1 |
Summary: Program for modifying or creating files |
| 2 | 2 |
Name: patch |
| 3 | 3 |
Version: 2.7.5 |
| 4 |
-Release: 6%{?dist}
|
|
| 4 |
+Release: 7%{?dist}
|
|
| 5 | 5 |
License: GPLv3+ |
| 6 | 6 |
URL: http://www.gnu.org/software/%{name}
|
| 7 | 7 |
Source0: ftp://ftp.gnu.org/gnu/patch/%{name}-%{version}.tar.gz
|
| 8 | 8 |
%define sha1 patch=04d23f6e48e95efb07d12ccf44d1f35fb210f457 |
| 9 | 9 |
Patch0: patch-CVE-2018-6951.patch |
| 10 | 10 |
Patch1: patch-CVE-2018-1000156.patch |
| 11 |
+Patch2: patch-CVE-2018-6952.patch |
|
| 11 | 12 |
Group: Development/Tools |
| 12 | 13 |
Vendor: VMware, Inc. |
| 13 | 14 |
Distribution: Photon |
| ... | ... |
@@ -18,9 +19,10 @@ file typically created by the diff program. |
| 18 | 18 |
%setup -q |
| 19 | 19 |
%patch0 -p1 |
| 20 | 20 |
%patch1 -p1 |
| 21 |
+%patch2 -p1 |
|
| 21 | 22 |
|
| 22 | 23 |
%build |
| 23 |
-./configure \ |
|
| 24 |
+%configure \ |
|
| 24 | 25 |
--prefix=%{_prefix} \
|
| 25 | 26 |
--disable-silent-rules |
| 26 | 27 |
make %{?_smp_mflags}
|
| ... | ... |
@@ -34,6 +36,8 @@ make %{?_smp_mflags} check
|
| 34 | 34 |
%{_bindir}/*
|
| 35 | 35 |
%{_mandir}/*/*
|
| 36 | 36 |
%changelog |
| 37 |
+* Mon Oct 08 2018 Sujay G <gsujay@vmware.com> 2.7.5-7 |
|
| 38 |
+- Apply patch for CVE-2018-6952 |
|
| 37 | 39 |
* Thu May 17 2018 Xiaolin Li <xiaolinl@vmware.com> 2.7.5-6 |
| 38 | 40 |
- Apply patch for CVE-2018-1000156 |
| 39 | 41 |
* Tue Apr 17 2018 Xiaolin Li <xiaolinl@vmware.com> 2.7.5-5 |