48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
|
From 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(-)
|
||
|
|
|
||
|
|
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
|
||
|
|
index 6fb5bb4a7a..d02147f0f2 100644
|
||
|
|
--- a/src/udev/udev-ctrl.c
|
||
|
|
+++ b/src/udev/udev-ctrl.c
|
||
|
|
@@ -73,6 +73,7 @@ struct udev_ctrl_connection {
|
||
|
|
struct udev_ctrl *udev_ctrl_new_from_fd(struct udev *udev, int fd) {
|
||
|
|
struct udev_ctrl *uctrl;
|
||
|
|
const int on = 1;
|
||
|
|
+ int r;
|
||
|
|
|
||
|
|
uctrl = new0(struct udev_ctrl, 1);
|
||
|
|
if (uctrl == NULL)
|
||
|
|
@@ -91,7 +92,9 @@ struct udev_ctrl *udev_ctrl_new_from_fd(struct udev *udev, int 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");
|
||
|
|
@@ -200,7 +203,10 @@ struct udev_ctrl_connection *udev_ctrl_get_connection(struct udev_ctrl *uctrl) {
|
||
|
|
}
|
||
|
|
|
||
|
|
/* 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:
|