morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 00:47:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2109 from keszybz/udev-null-deref

Browse Source 
Udev null deref
This commit is contained in:
Martin Pitt
2015-12-07 17:35:32 +01:00
parent 1fbcad80f0 9eba69df1c
commit 1941d19a54
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libudev/libudev-device-private.c
View File

@@ -137,14 +137,10 @@ gid_t udev_device_get_devnode_gid(struct udev_device *udev_device) {
}
void udev_device_ensure_usec_initialized(struct udev_device *udev_device, struct udev_device *udev_device_old) {
sd_device *device_old = NULL;
assert(udev_device);
if (udev_device_old)
device_old = udev_device_old->device;
device_ensure_usec_initialized(udev_device->device, device_old);
device_ensure_usec_initialized(udev_device->device,
udev_device_old ? udev_device_old->device : NULL);
}
char **udev_device_get_properties_envp(struct udev_device *udev_device) {

8
src/udev/udev-event.c
View File

@@ -848,11 +848,11 @@ void udev_event_execute_rules(struct udev_event *event,
/* disable watch during event processing */
if (major(udev_device_get_devnum(dev)) != 0)
udev_watch_end(event->udev, event->dev_db);
}
if (major(udev_device_get_devnum(dev)) == 0 &&
streq(udev_device_get_action(dev), "move"))
udev_device_copy_properties(dev, event->dev_db);
if (major(udev_device_get_devnum(dev)) == 0 &&
streq(udev_device_get_action(dev), "move"))
udev_device_copy_properties(dev, event->dev_db);
}
udev_rules_apply_to_event(rules, event,
timeout_usec, timeout_warn_usec,