forked from pool/systemd
2e6aa36589
- Import a better fix from upstream for bsc#1001765
- Added:
0001-pid1-more-informative-error-message-for-ignored-noti.patch
0001-pid1-process-zero-length-notification-messages-again.patch
- Updated (no code changes, only patch metadata)
0001-If-the-notification-message-length-is-0-ignore-the-m.patch
0001-pid1-don-t-return-any-error-in-manager_dispatch_noti.patch
- Re add back "udev: don't require nsserv and fillup"
Did this in the wrong project... it was a complicated day today ;)
- Added 2 patches to fix bsc#1001765
0001-If-the-notification-message-length-is-0-ignore-the-m.patch
0001-pid1-don-t-return-any-error-in-manager_dispatch_noti.patch
- Revert "udev: don't require nsserv and fillup"
It's been judged too late for being part of SLE12 final release.
Nevertheless it's part of Factory and will be reintroduced after the
final release is out (ie through an update).
- systemd-sysv-convert: make sure that
/var/lib/systemd/sysv-convert/database is always initialized (bsc#982211)
If "--save" command was used and the sysv init script wasn't enabled
at all the database file wasn't created at all. This makes the
subsequent call to "--apply" fail even though this should not
considered as an error.
- Added patches to fix journal with FSS protection enabled (bsc#1000435)
0001-journal-fix-HMAC-calculation-when-appending-a-data-o.patch
0001-journal-set-STATE_ARCHIVED-as-part-of-offlining-2740.patch
OBS-URL: https://build.opensuse.org/request/show/431464
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=241
33 lines
1020 B
Diff
33 lines
1020 B
Diff
From ddcd0b726adfd78260ec3d6a446800d85980069e Mon Sep 17 00:00:00 2001
|
|
From: Jorge Niedbalski <jorge.niedbalski@canonical.com>
|
|
Date: Wed, 28 Sep 2016 18:25:50 -0300
|
|
Subject: [PATCH 1/1] If the notification message length is 0, ignore the
|
|
message (#4237)
|
|
|
|
Fixes #4234.
|
|
|
|
Signed-off-by: Jorge Niedbalski <jnr@metaklass.org>
|
|
(cherry picked from commit 531ac2b2349da02acc9c382849758e07eb92b020)
|
|
---
|
|
src/core/manager.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/src/core/manager.c b/src/core/manager.c
|
|
index 229cb31..56ca9cf 100644
|
|
--- a/src/core/manager.c
|
|
+++ b/src/core/manager.c
|
|
@@ -1565,6 +1565,10 @@ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t
|
|
|
|
return -errno;
|
|
}
|
|
+ if (n == 0) {
|
|
+ log_debug("Got zero-length notification message. Ignoring.");
|
|
+ return 0;
|
|
+ }
|
|
|
|
CMSG_FOREACH(cmsg, &msghdr) {
|
|
if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS) {
|
|
--
|
|
2.10.0
|
|
|