Fixes https://github.com/systemd/systemd/issues/3352
Change-Id: I37d8e357ce0926251d82e2f450ec13a1fd74fa10
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6771
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Tested-by: Anish Swaminathan <anishs@vmware.com>
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,23 @@ |
| 0 |
+From 3fb1ac5d57954bb0d881a68777e996b46ed44ce3 Mon Sep 17 00:00:00 2001 |
|
| 1 |
+From: tomty89 <tom.ty89@gmail.com> |
|
| 2 |
+Date: Sat, 4 Jun 2016 18:31:07 +0800 |
|
| 3 |
+Subject: [PATCH] networkd-link: fix handler typo for route_remove() (#3433) |
|
| 4 |
+ |
|
| 5 |
+Obviously we've been using the wrong handler here. Fixes #3352. |
|
| 6 |
+--- |
|
| 7 |
+ src/network/networkd-link.c | 2 +- |
|
| 8 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
|
| 9 |
+ |
|
| 10 |
+diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c |
|
| 11 |
+index ba4147f8756..ee52b1ce1e1 100644 |
|
| 12 |
+--- a/src/network/networkd-link.c |
|
| 13 |
+@@ -2252,7 +2252,7 @@ static int link_drop_foreign_config(Link *link) {
|
|
| 14 |
+ if (route->protocol == RTPROT_KERNEL) |
|
| 15 |
+ continue; |
|
| 16 |
+ |
|
| 17 |
+- r = route_remove(route, link, link_address_remove_handler); |
|
| 18 |
++ r = route_remove(route, link, link_route_remove_handler); |
|
| 19 |
+ if (r < 0) |
|
| 20 |
+ return r; |
|
| 21 |
+ } |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Systemd-228 |
| 2 | 2 |
Name: systemd |
| 3 | 3 |
Version: 228 |
| 4 |
-Release: 50%{?dist}
|
|
| 4 |
+Release: 51%{?dist}
|
|
| 5 | 5 |
License: LGPLv2+ and GPLv2+ and MIT |
| 6 | 6 |
URL: http://www.freedesktop.org/wiki/Software/systemd/ |
| 7 | 7 |
Group: System Environment/Security |
| ... | ... |
@@ -51,6 +51,7 @@ Patch33: systemd-228-CVE-2018-15686.patch |
| 51 | 51 |
Patch34: systemd-228-CVE-2018-16864.patch |
| 52 | 52 |
Patch35: systemd-228-CVE-2018-16865.patch |
| 53 | 53 |
Patch36: systemd-228-CVE-2018-16866.patch |
| 54 |
+Patch37: systemd-228-fix-handler-route-remove.patch |
|
| 54 | 55 |
Requires: Linux-PAM |
| 55 | 56 |
Requires: libcap |
| 56 | 57 |
Requires: xz |
| ... | ... |
@@ -121,6 +122,7 @@ sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h") |
| 121 | 121 |
%patch34 -p1 |
| 122 | 122 |
%patch35 -p1 |
| 123 | 123 |
%patch36 -p1 |
| 124 |
+%patch37 -p1 |
|
| 124 | 125 |
sed -i "s#\#DefaultTasksMax=512#DefaultTasksMax=infinity#g" src/core/system.conf |
| 125 | 126 |
|
| 126 | 127 |
%build |
| ... | ... |
@@ -261,6 +263,8 @@ rm -rf %{buildroot}/*
|
| 261 | 261 |
|
| 262 | 262 |
|
| 263 | 263 |
%changelog |
| 264 |
+* Thu Feb 21 2019 Anish Swaminathan <anishs@vmware.com> 228-51 |
|
| 265 |
+- Fix handler typo for route_remove |
|
| 264 | 266 |
* Thu Jan 10 2019 Anish Swaminathan <anishs@vmware.com> 228-50 |
| 265 | 267 |
- Fix CVE-2018-16864, CVE-2018-16865, CVE-2018-16866 |
| 266 | 268 |
* Fri Jan 04 2019 Anish Swaminathan <anishs@vmware.com> 228-49 |