Browse code
Apply patch for fixing CVE-2018-14404
Change-Id: I207c566d6805ad51c8768764e78bf4c6426b833e
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6040
Tested-by: Siju Maliakkal <smaliakkal@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
smaliakkal authored on 2018/10/30 08:12:58Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,27 @@ |
| 0 |
+diff -ru a/xpath.c b/xpath.c |
|
| 1 |
+--- a/xpath.c 2017-10-26 07:54:40.000000000 +0000 |
|
| 2 |
+@@ -13337,9 +13337,8 @@ |
|
| 3 |
+ return(0); |
|
| 4 |
+ } |
|
| 5 |
+ xmlXPathBooleanFunction(ctxt, 1); |
|
| 6 |
+- arg1 = valuePop(ctxt); |
|
| 7 |
+- arg1->boolval &= arg2->boolval; |
|
| 8 |
+- valuePush(ctxt, arg1); |
|
| 9 |
++ if (ctxt->value != NULL) |
|
| 10 |
++ ctxt->value->boolval &= arg2->boolval; |
|
| 11 |
+ xmlXPathReleaseObject(ctxt->context, arg2); |
|
| 12 |
+ return (total); |
|
| 13 |
+ case XPATH_OP_OR: |
|
| 14 |
+@@ -13363,9 +13362,8 @@ |
|
| 15 |
+ return(0); |
|
| 16 |
+ } |
|
| 17 |
+ xmlXPathBooleanFunction(ctxt, 1); |
|
| 18 |
+- arg1 = valuePop(ctxt); |
|
| 19 |
+- arg1->boolval |= arg2->boolval; |
|
| 20 |
+- valuePush(ctxt, arg1); |
|
| 21 |
++ if (ctxt->value != NULL) |
|
| 22 |
++ ctxt->value->boolval |= arg2->boolval; |
|
| 23 |
+ xmlXPathReleaseObject(ctxt->context, arg2); |
|
| 24 |
+ return (total); |
|
| 25 |
+ case XPATH_OP_EQUAL: |
| ... | ... |
@@ -4,13 +4,14 @@ |
| 4 | 4 |
Summary: Libxml2 |
| 5 | 5 |
Name: libxml2 |
| 6 | 6 |
Version: 2.9.8 |
| 7 |
-Release: 1%{?dist}
|
|
| 7 |
+Release: 2%{?dist}
|
|
| 8 | 8 |
License: MIT |
| 9 | 9 |
URL: http://xmlsoft.org/ |
| 10 | 10 |
Group: System Environment/General Libraries |
| 11 | 11 |
Vendor: VMware, Inc. |
| 12 | 12 |
Distribution: Photon |
| 13 | 13 |
Source0: http://xmlsoft.org/sources/%{name}-%{version}.tar.gz
|
| 14 |
+Patch0: Fix_nullptr_deref_with_XPath_logic_ops.patch |
|
| 14 | 15 |
%define sha1 libxml2=66bcefd98a6b7573427cf66f9d3841b59eb5b8c3 |
| 15 | 16 |
Provides: pkgconfig(libxml-2.0) |
| 16 | 17 |
|
| ... | ... |
@@ -49,6 +50,7 @@ Static libraries and header files for the support library for libxml |
| 49 | 49 |
|
| 50 | 50 |
%prep |
| 51 | 51 |
%setup -q |
| 52 |
+%patch0 -p1 |
|
| 52 | 53 |
sed \ |
| 53 | 54 |
-e /xmlInitializeCatalog/d \ |
| 54 | 55 |
-e 's/((ent->checked =.*&&/(((ent->checked == 0) ||\ |
| ... | ... |
@@ -112,6 +114,8 @@ rm -rf %{buildroot}/*
|
| 112 | 112 |
|
| 113 | 113 |
|
| 114 | 114 |
%changelog |
| 115 |
+* Mon Oct 29 2018 Siju Maliakkal <smaliakkal@vmware.com> 2.9.8-2 |
|
| 116 |
+- Apply patch to fix CVE-2018-14404 |
|
| 115 | 117 |
* Fri May 11 2018 Sharath George <sharathg@vmware.com> 2.9.8-1 |
| 116 | 118 |
- Update to 2.9.8 |
| 117 | 119 |
* Mon Dec 04 2017 Kumar Kaushik <kaushikk@vmware.com> 2.9.6-2 |