Browse code
patch : Apply patch for CVE-2018-6951
Change-Id: I2c0e56140ef12318e6a49fe44e6ca12bb2c9b069
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5028
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George
Xiaolin Li authored on 2018/04/19 05:16:43Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,29 @@ |
| 0 |
+From f290f48a621867084884bfff87f8093c15195e6a Mon Sep 17 00:00:00 2001 |
|
| 1 |
+From: Andreas Gruenbacher <agruen@gnu.org> |
|
| 2 |
+Date: Mon, 12 Feb 2018 16:48:24 +0100 |
|
| 3 |
+Subject: Fix segfault with mangled rename patch |
|
| 4 |
+ |
|
| 5 |
+http://savannah.gnu.org/bugs/?53132 |
|
| 6 |
+* src/pch.c (intuit_diff_type): Ensure that two filenames are specified |
|
| 7 |
+for renames and copies (fix the existing check). |
|
| 8 |
+--- |
|
| 9 |
+ src/pch.c | 3 ++- |
|
| 10 |
+ 1 file changed, 2 insertions(+), 1 deletion(-) |
|
| 11 |
+ |
|
| 12 |
+diff --git a/src/pch.c b/src/pch.c |
|
| 13 |
+index ff9ed2c..bc6278c 100644 |
|
| 14 |
+--- a/src/pch.c |
|
| 15 |
+@@ -974,7 +974,8 @@ intuit_diff_type (bool need_header, mode_t *p_file_type) |
|
| 16 |
+ if ((pch_rename () || pch_copy ()) |
|
| 17 |
+ && ! inname |
|
| 18 |
+ && ! ((i == OLD || i == NEW) && |
|
| 19 |
+- p_name[! reverse] && |
|
| 20 |
++ p_name[reverse] && p_name[! reverse] && |
|
| 21 |
++ name_is_valid (p_name[reverse]) && |
|
| 22 |
+ name_is_valid (p_name[! reverse]))) |
|
| 23 |
+ {
|
|
| 24 |
+ say ("Cannot %s file without two valid file names\n", pch_rename () ? "rename" : "copy");
|
|
| 25 |
+-- |
|
| 26 |
+cgit v1.0-41-gc330 |
|
| 27 |
+ |
| ... | ... |
@@ -1,23 +1,25 @@ |
| 1 |
-Summary: Program for modifying or creating files |
|
| 2 |
-Name: patch |
|
| 3 |
-Version: 2.7.5 |
|
| 4 |
-Release: 2%{?dist}
|
|
| 5 |
-License: GPLv3+ |
|
| 6 |
-URL: http://www.gnu.org/software/%{name}
|
|
| 7 |
-Source0: ftp://ftp.gnu.org/gnu/patch/%{name}-%{version}.tar.gz
|
|
| 1 |
+Summary: Program for modifying or creating files |
|
| 2 |
+Name: patch |
|
| 3 |
+Version: 2.7.5 |
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 |
+License: GPLv3+ |
|
| 6 |
+URL: http://www.gnu.org/software/%{name}
|
|
| 7 |
+Source0: ftp://ftp.gnu.org/gnu/patch/%{name}-%{version}.tar.gz
|
|
| 8 | 8 |
%define sha1 patch=04d23f6e48e95efb07d12ccf44d1f35fb210f457 |
| 9 |
-Group: Development/Tools |
|
| 10 |
-Vendor: VMware, Inc. |
|
| 11 |
-Distribution: Photon |
|
| 9 |
+Patch0: patch-CVE-2018-6951.patch |
|
| 10 |
+Group: Development/Tools |
|
| 11 |
+Vendor: VMware, Inc. |
|
| 12 |
+Distribution: Photon |
|
| 12 | 13 |
%description |
| 13 | 14 |
Program for modifying or creating files by applying a patch |
| 14 | 15 |
file typically created by the diff program. |
| 15 | 16 |
%prep |
| 16 | 17 |
%setup -q |
| 18 |
+%patch0 -p1 |
|
| 17 | 19 |
%build |
| 18 | 20 |
./configure \ |
| 19 |
- --prefix=%{_prefix} \
|
|
| 20 |
- --disable-silent-rules |
|
| 21 |
+ --prefix=%{_prefix} \
|
|
| 22 |
+ --disable-silent-rules |
|
| 21 | 23 |
make %{?_smp_mflags}
|
| 22 | 24 |
%install |
| 23 | 25 |
make DESTDIR=%{buildroot} install
|
| ... | ... |
@@ -28,9 +30,11 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
|
| 28 | 28 |
%{_bindir}/*
|
| 29 | 29 |
%{_mandir}/*/*
|
| 30 | 30 |
%changelog |
| 31 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.7.5-2 |
|
| 32 |
-- GA - Bump release of all rpms |
|
| 33 |
-* Tue Aug 11 2015 Divya Thaluru <dthaluru@vmware.com> 2.7.5-1 |
|
| 34 |
-- Updating to 2.7.5 version |
|
| 35 |
-* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.7.1-1 |
|
| 36 |
-- Initial build. First version |
|
| 31 |
+* Tue Apr 17 2018 Xiaolin Li <xiaolinl@vmware.com> 2.7.5-3 |
|
| 32 |
+- Apply patch for CVE-2018-6951 |
|
| 33 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.7.5-2 |
|
| 34 |
+- GA - Bump release of all rpms |
|
| 35 |
+* Tue Aug 11 2015 Divya Thaluru <dthaluru@vmware.com> 2.7.5-1 |
|
| 36 |
+- Updating to 2.7.5 version |
|
| 37 |
+* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.7.1-1 |
|
| 38 |
+- Initial build. First version |