summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2015-06-23 17:07:40 +0200
committerTom Gundersen <teg@jklm.no>2015-06-23 17:20:12 +0200
commitb6aab8ef9c4ac7555229fc741ea807bee093df31 (patch)
tree7feaf1de1ce475f8865f9be23c732fb440294cee
parentf6e0a35376dcab1455af698cf3f3be5e810c0f20 (diff)
udev: worker - check return value of udev_monitor_enable_receiving()
Fixes CID#1297430.
-rw-r--r--src/udev/udevd.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index ff15664cb4..cf15ddf641 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -327,6 +327,7 @@ static void worker_spawn(Manager *manager, struct event *event) {
struct udev *udev = event->udev;
_cleanup_udev_monitor_unref_ struct udev_monitor *worker_monitor = NULL;
pid_t pid;
+ int r = 0;
/* listen for new events */
worker_monitor = udev_monitor_new_from_netlink(udev, NULL);
@@ -334,7 +335,9 @@ static void worker_spawn(Manager *manager, struct event *event) {
return;
/* allow the main daemon netlink address to send devices to the worker */
udev_monitor_allow_unicast_sender(worker_monitor, manager->monitor);
- udev_monitor_enable_receiving(worker_monitor);
+ r = udev_monitor_enable_receiving(worker_monitor);
+ if (r < 0)
+ log_error_errno(r, "worker: could not enable receiving of device: %m");
pid = fork();
switch (pid) {
@@ -346,7 +349,6 @@ static void worker_spawn(Manager *manager, struct event *event) {
struct epoll_event ep_signal = { .events = EPOLLIN };
struct epoll_event ep_monitor = { .events = EPOLLIN };
sigset_t mask;
- int r = 0;
/* take initial device from queue */
dev = event->dev;
@@ -528,7 +530,6 @@ out:
default:
{
struct worker *worker;
- int r;
r = worker_new(&worker, manager, worker_monitor, pid);
if (r < 0)