forked from pool/systemd
e7c96ab7f3
- Add patch 0001-bnc888612-logind-polkit-acpi.patch from Frederic to solve bnc#888612 - AUDIT-0: Power button press at gdm login should not prompt for credentials - Add upstream bugfix patches 0001-journal-Do-not-count-on-the-compiler-initializing-fo.patch 0002-include-fcntl.h-rather-than-sys-fcntl.h.patch 0003-mount-order-options-before-other-arguments-to-mount.patch 0004-shared-wtmp-utmp-don-t-clear-store_wtmp-in-utmp_put_.patch 0005-shared-label.h-add-missing-stdio.h-include.patch 0006-shared-sparse-endian.h-add-missing-byteswap.h-includ.patch 0007-libudev-monitor-warn-if-we-fail-to-request-SO_PASSCR.patch 0008-shared-conf-parser-don-t-leak-memory-on-error-in-DEF.patch 1080-udevd-parse_argv-warn-if-argumens-are-invalid.patch 1081-udevd-check-return-of-various-functions.patch 1082-udevadm-hwdb-check-return-value-of-fseeko.patch 1083-udev-node-warn-if-chmod-chown-fails.patch 1084-udev-ctrl-log-if-setting-SO_PASSCRED-fails.patch 1085-udev-fix-typos.patch 1086-udevd-don-t-fail-if-run-udev-exists.patch - Add upstream bugfix patches 0001-core-fix-resource-leak-in-manager_environment_add.patch 0002-util-remove-a-unnecessary-check.patch 0003-udev-event-explicitly-don-t-read-from-invalid-fd.patch 0004-shared-conf-parser.patch 0005-logind-fix-typo.patch 0006-systemctl-fix-resource-leak-CID-1237747.patch 0007-libudev-monitor-warn-if-we-fail-to-request-SO_PASSCR.patch 0008-shared-conf-parser-don-t-leak-memory-on-error-in-DEF.patc OBS-URL: https://build.opensuse.org/request/show/250254 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=207
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
Based on 4bbdff757ed4e718a3348b93439a03055cc5e3bc Mon Sep 17 00:00:00 2001
|
|
From: Tom Gundersen <teg@jklm.no>
|
|
Date: Thu, 18 Sep 2014 19:26:11 +0200
|
|
Subject: [PATCH] udev: ctrl - log if setting SO_PASSCRED fails
|
|
|
|
No functional change.
|
|
|
|
Found by Coverity. Fixes CID #1237533.
|
|
---
|
|
src/udev/udev-ctrl.c | 10 ++++++++--
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
--- src/udev/udev-ctrl.c
|
|
+++ src/udev/udev-ctrl.c 2014-09-19 10:45:55.494236229 +0000
|
|
@@ -74,6 +74,7 @@ struct udev_ctrl *udev_ctrl_new_from_fd(
|
|
{
|
|
struct udev_ctrl *uctrl;
|
|
const int on = 1;
|
|
+ int r;
|
|
|
|
uctrl = new0(struct udev_ctrl, 1);
|
|
if (uctrl == NULL)
|
|
@@ -92,7 +93,9 @@ struct udev_ctrl *udev_ctrl_new_from_fd(
|
|
uctrl->bound = true;
|
|
uctrl->sock = fd;
|
|
}
|
|
- setsockopt(uctrl->sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
|
|
+ r = setsockopt(uctrl->sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
|
|
+ if (r < 0)
|
|
+ log_warning("could not set SO_PASSCRED: %m");
|
|
|
|
uctrl->saddr.sun_family = AF_LOCAL;
|
|
strscpy(uctrl->saddr.sun_path, sizeof(uctrl->saddr.sun_path), "/run/udev/control");
|
|
@@ -209,7 +212,10 @@ struct udev_ctrl_connection *udev_ctrl_g
|
|
}
|
|
|
|
/* enable receiving of the sender credentials in the messages */
|
|
- setsockopt(conn->sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
|
|
+ r = setsockopt(conn->sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
|
|
+ if (r < 0)
|
|
+ log_warning("colud not set SO_PASSCRED: %m");
|
|
+
|
|
udev_ctrl_ref(uctrl);
|
|
return conn;
|
|
err:
|