Browse code
Fix CVE in systemd-notify socket
Change-Id: I47b403499ee564df314b02bb9acf2562a835dd23
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1468
Reviewed-by: Divya Thaluru <dthaluru@vmware.com>
Tested-by: gerrit-photon <photon-checkins@vmware.com>
(cherry picked from commit 5c18ace74ac8e2781dddc01c6b9d4b4c3a3f25ea)
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1471
Reviewed-by: Vinay Kulkarni <kulkarniv@vmware.com>
Vinay Kulkarni authored on 2016/09/29 17:30:19Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,15 @@ |
| 0 |
+diff --git a/src/core/manager.c b/src/core/manager.c |
|
| 1 |
+index fa8deb9..43e231c 100644 |
|
| 2 |
+--- a/src/core/manager.c |
|
| 3 |
+@@ -1721,6 +1721,10 @@ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t |
|
| 4 |
+ |
|
| 5 |
+ return -errno; |
|
| 6 |
+ } |
|
| 7 |
++ if (n == 0) {
|
|
| 8 |
++ log_debug("Got zero-length notification message. Ignoring.");
|
|
| 9 |
++ return 0; |
|
| 10 |
++ } |
|
| 11 |
+ |
|
| 12 |
+ CMSG_FOREACH(cmsg, &msghdr) {
|
|
| 13 |
+ if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS) {
|
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Systemd-228 |
| 2 | 2 |
Name: systemd |
| 3 | 3 |
Version: 228 |
| 4 |
-Release: 30%{?dist}
|
|
| 4 |
+Release: 31%{?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 |
| ... | ... |
@@ -32,6 +32,7 @@ Patch16: systemd-228-dhcp-duid-api-update.patch |
| 32 | 32 |
Patch17: systemd-228-domains-search-fix.patch |
| 33 | 33 |
Patch18: systemd-228-dns-transaction-pending-fix.patch |
| 34 | 34 |
Patch19: 02-install-general-aliases.patch |
| 35 |
+Patch20: systemd-228-CVE-notify-socket-DOS-fix.patch |
|
| 35 | 36 |
Requires: Linux-PAM |
| 36 | 37 |
Requires: libcap |
| 37 | 38 |
Requires: xz |
| ... | ... |
@@ -84,6 +85,7 @@ sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h") |
| 84 | 84 |
%patch17 -p1 |
| 85 | 85 |
%patch18 -p1 |
| 86 | 86 |
%patch19 -p1 |
| 87 |
+%patch20 -p1 |
|
| 87 | 88 |
sed -i "s#\#DefaultTasksMax=512#DefaultTasksMax=infinity#g" src/core/system.conf |
| 88 | 89 |
|
| 89 | 90 |
%build |
| ... | ... |
@@ -193,6 +195,8 @@ rm -rf %{buildroot}/*
|
| 193 | 193 |
%dir %{_localstatedir}/log/journal
|
| 194 | 194 |
|
| 195 | 195 |
%changelog |
| 196 |
+* Thu Sep 29 2016 Vinay Kulkarni <kulkarniv@vmware.com> 228-31 |
|
| 197 |
+- Fix a CVE in systemd-notify socket. |
|
| 196 | 198 |
* Mon Aug 29 2016 Alexey Makhalov <amakhalov@vmware.com> 228-30 |
| 197 | 199 |
- 02-install-general-aliases.patch to create absolute symlinks |
| 198 | 200 |
* Fri Aug 26 2016 Anish Swaminathan <anishs@vmware.com> 228-29 |