Browse code
Fix systemd IPv6 link disable nullptr access
Change-Id: Id5afbfb01e8cf651835d66f63e625fd6eef83a66
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4240
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Xiaolin Li <xiaolinl@vmware.com>
(cherry picked from commit 9060ed4471a08a2c77e0b7b8aed2e3cfa1300749)
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4257
Reviewed-by: Vinay Kulkarni <kulkarniv@vmware.com>
Vinay Kulkarni authored on 2017/11/08 23:30:04Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,15 @@ |
| 0 |
+diff -uNr systemd-233/src/network/networkd-link.c systemd-233-new/src/network/networkd-link.c |
|
| 1 |
+--- systemd-233/src/network/networkd-link.c 2017-11-07 20:56:56.740898979 +0000 |
|
| 2 |
+@@ -213,8 +213,10 @@ |
|
| 3 |
+ p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/disable_ipv6");
|
|
| 4 |
+ _cleanup_free_ char *val = NULL; |
|
| 5 |
+ r = read_one_line_file(p, &val); |
|
| 6 |
+- if (r < 0) |
|
| 7 |
++ if (r < 0) {
|
|
| 8 |
+ log_link_warning_errno(link, r, "Cannot read ipv6 state for interface: %m"); |
|
| 9 |
++ return false; |
|
| 10 |
++ } |
|
| 11 |
+ if (streq(val, "0")) |
|
| 12 |
+ return false; |
|
| 13 |
+ |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Systemd-233 |
| 2 | 2 |
Name: systemd |
| 3 | 3 |
Version: 233 |
| 4 |
-Release: 9%{?dist}
|
|
| 4 |
+Release: 10%{?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 |
| ... | ... |
@@ -26,6 +26,7 @@ Patch8: systemd-233-CVE-2017-9445-dns-oob.patch |
| 26 | 26 |
Patch9: systemd-233-CVE-2017-1000082-1.patch |
| 27 | 27 |
Patch10: systemd-233-CVE-2017-1000082-2.patch |
| 28 | 28 |
Patch11: systemd-233-ra-improvements.patch |
| 29 |
+Patch12: systemd-233-link-disabled-nullptr-fix.patch |
|
| 29 | 30 |
|
| 30 | 31 |
Requires: Linux-PAM |
| 31 | 32 |
Requires: libcap |
| ... | ... |
@@ -91,6 +92,7 @@ sed -i "/xlocale.h/d" src/basic/parse-util.c |
| 91 | 91 |
%patch9 -p1 |
| 92 | 92 |
%patch10 -p1 |
| 93 | 93 |
%patch11 -p1 |
| 94 |
+%patch12 -p1 |
|
| 94 | 95 |
|
| 95 | 96 |
sed -i "s#\#DefaultTasksMax=512#DefaultTasksMax=infinity#g" src/core/system.conf |
| 96 | 97 |
|
| ... | ... |
@@ -239,6 +241,8 @@ rm -rf %{buildroot}/*
|
| 239 | 239 |
%files lang -f %{name}.lang
|
| 240 | 240 |
|
| 241 | 241 |
%changelog |
| 242 |
+* Tue Nov 07 2017 Vinay Kulkarni <kulkarniv@vmware.com> 233-10 |
|
| 243 |
+- Fix nullptr access during link disable. |
|
| 242 | 244 |
* Mon Sep 18 2017 Anish Swaminathan <anishs@vmware.com> 233-9 |
| 243 | 245 |
- Backport router solicitation backoff from systemd 234 |
| 244 | 246 |
* Fri Sep 15 2017 Anish Swaminathan <anishs@vmware.com> 233-8 |