picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

udevd: do not treat negative value as valid ifindex 

Also, some conditions in is_devpath_busy() are similified.
This commit is contained in:
Yu Watanabe 2018-11-12 13:07:06 +09:00
parent 8ecbc4b880
commit edc81c1ccb
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/udev/udevd.c
View File

@ -653,11 +653,11 @@ static bool is_devpath_busy(Manager *manager, struct event *event) {
return true;
/* check network device ifindex */
if (event->ifindex != 0 && event->ifindex == loop_event->ifindex)
if (event->ifindex > 0 && event->ifindex == loop_event->ifindex)
return true;
/* check our old name */
if (event->devpath_old != NULL && streq(loop_event->devpath, event->devpath_old)) {
if (event->devpath_old && streq(loop_event->devpath, event->devpath_old)) {
event->delaying_seqnum = loop_event->seqnum;
return true;
}
@ -672,9 +672,7 @@ static bool is_devpath_busy(Manager *manager, struct event *event) {
/* identical device event found */
if (loop_event->devpath_len == event->devpath_len) {
/* devices names might have changed/swapped in the meantime */
if (major(event->devnum) != 0 && (event->devnum != loop_event->devnum || event->is_block != loop_event->is_block))
continue;
if (event->ifindex != 0 && event->ifindex != loop_event->ifindex)
if (major(event->devnum) != 0 || event->ifindex > 0)
continue;
event->delaying_seqnum = loop_event->seqnum;
return true;
@ -691,9 +689,6 @@ static bool is_devpath_busy(Manager *manager, struct event *event) {
event->delaying_seqnum = loop_event->seqnum;
return true;
}
/* no matching device */
continue;
}
return false;