shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-11 05:17:44 +03:00
Code

udev: worker - check return value of udev_monitor_enable_receiving()

Browse Source 
Fixes CID#1297430.
This commit is contained in:
Tom Gundersen 2015-06-23 17:07:40 +02:00
parent f6e0a35376
commit b6aab8ef9c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/udev/udevd.c
View File

@ -327,6 +327,7 @@ static void worker_spawn(Manager *manager, struct event *event) {
struct udev *udev = event->udev; struct udev *udev = event->udev;
_cleanup_udev_monitor_unref_ struct udev_monitor *worker_monitor = NULL; _cleanup_udev_monitor_unref_ struct udev_monitor *worker_monitor = NULL;
pid_t pid; pid_t pid;
int r = 0;
/* listen for new events */ /* listen for new events */
worker_monitor = udev_monitor_new_from_netlink(udev, NULL); worker_monitor = udev_monitor_new_from_netlink(udev, NULL);
@ -334,7 +335,9 @@ static void worker_spawn(Manager *manager, struct event *event) {
return; return;
/* allow the main daemon netlink address to send devices to the worker */ /* allow the main daemon netlink address to send devices to the worker */
udev_monitor_allow_unicast_sender(worker_monitor, manager->monitor); 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(); pid = fork();
switch (pid) { 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_signal = { .events = EPOLLIN };
struct epoll_event ep_monitor = { .events = EPOLLIN }; struct epoll_event ep_monitor = { .events = EPOLLIN };
sigset_t mask; sigset_t mask;
int r = 0;
/* take initial device from queue */ /* take initial device from queue */
dev = event->dev; dev = event->dev;
@ -528,7 +530,6 @@ out:
default: default:
{ {
struct worker *worker; struct worker *worker;
int r;
r = worker_new(&worker, manager, worker_monitor, pid); r = worker_new(&worker, manager, worker_monitor, pid);
if (r < 0) if (r < 0)