Browse code
fix ruby CVE-2017-9228
Change-Id: I9bab71423ee92dc1c588f4c93a677a7215997990
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3334
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Siju Maliakkal <smaliakkal@vmware.com>
Priyesh Padmavilasom authored on 2017/07/25 11:57:37Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,15 @@ |
| 0 |
+diff --git a/regparse.c b/regparse.c.1 |
|
| 1 |
+index 1e0dfd9..d99cbcd 100644 |
|
| 2 |
+--- a/regparse.c |
|
| 3 |
+@@ -4433,7 +4433,9 @@ next_state_class(CClassNode* cc, CClassNode* asc_cc, |
|
| 4 |
+ } |
|
| 5 |
+ } |
|
| 6 |
+ |
|
| 7 |
+- *state = CCS_VALUE; |
|
| 8 |
++ if (*state != CCS_START) |
|
| 9 |
++ *state = CCS_VALUE; |
|
| 10 |
++ |
|
| 11 |
+ *type = CCV_CLASS; |
|
| 12 |
+ return 0; |
|
| 13 |
+ } |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Ruby |
| 2 | 2 |
Name: ruby |
| 3 | 3 |
Version: 2.4.1 |
| 4 |
-Release: 2%{?dist}
|
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 | 5 |
License: BSDL |
| 6 | 6 |
URL: https://www.ruby-lang.org/en/ |
| 7 | 7 |
Group: System Environment/Security |
| ... | ... |
@@ -13,6 +13,7 @@ Patch0: ruby-CVE-2017-9224.patch |
| 13 | 13 |
Patch1: ruby-CVE-2017-9226.patch |
| 14 | 14 |
Patch2: ruby-CVE-2017-9227.patch |
| 15 | 15 |
Patch3: ruby-CVE-2017-9229.patch |
| 16 |
+Patch4: ruby-CVE-2017-9228.patch |
|
| 16 | 17 |
BuildRequires: openssl-devel |
| 17 | 18 |
BuildRequires: ca-certificates |
| 18 | 19 |
BuildRequires: readline-devel |
| ... | ... |
@@ -31,6 +32,7 @@ This is useful for object-oriented scripting. |
| 31 | 31 |
%patch1 -p1 |
| 32 | 32 |
%patch2 -p1 |
| 33 | 33 |
%patch3 -p1 |
| 34 |
+%patch4 -p1 |
|
| 34 | 35 |
%build |
| 35 | 36 |
./configure \ |
| 36 | 37 |
--prefix=%{_prefix} \
|
| ... | ... |
@@ -58,6 +60,8 @@ rm -rf %{buildroot}/*
|
| 58 | 58 |
%{_docdir}/%{name}-%{version}
|
| 59 | 59 |
%{_mandir}/man1/*
|
| 60 | 60 |
%changelog |
| 61 |
+* Mon Jul 24 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.4.1-3 |
|
| 62 |
+- [security] CVE-2017-9228 |
|
| 61 | 63 |
* Tue Jun 13 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.4.1-2 |
| 62 | 64 |
- [security] CVE-2017-9224,CVE-2017-9225 |
| 63 | 65 |
- [security] CVE-2017-9227,CVE-2017-9229 |