chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udevd: use dev_t or netif ifindex as database key
[elogind.git]
/
udev
/
udev-event.c
diff --git
a/udev/udev-event.c
b/udev/udev-event.c
index ae523f83c5727249c6b7afae7c018780a698cb52..f41f06b16a0b29a93d6c5e4f0bf3cba3a2a0db85 100644
(file)
--- a/
udev/udev-event.c
+++ b/
udev/udev-event.c
@@
-472,8
+472,9
@@
static int rename_netif(struct udev_event *event)
sk = socket(PF_INET, SOCK_DGRAM, 0);
if (sk < 0) {
sk = socket(PF_INET, SOCK_DGRAM, 0);
if (sk < 0) {
+ err = -errno;
err(event->udev, "error opening socket: %m\n");
err(event->udev, "error opening socket: %m\n");
- return
-errno
;
+ return
err
;
}
memset(&ifr, 0x00, sizeof(struct ifreq));
}
memset(&ifr, 0x00, sizeof(struct ifreq));
@@
-534,6
+535,9
@@
int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
struct udev_device *dev = event->dev;
int err = 0;
struct udev_device *dev = event->dev;
int err = 0;
+ if (udev_device_get_subsystem(dev) == NULL)
+ return -1;
+
if (strcmp(udev_device_get_action(dev), "remove") == 0) {
udev_device_read_db(dev);
udev_device_delete_db(dev);
if (strcmp(udev_device_get_action(dev), "remove") == 0) {
udev_device_read_db(dev);
udev_device_delete_db(dev);