Add forgotten patch

This commit is contained in:
Jan Synacek 2015-12-14 10:41:03 +01:00
parent 60ed166b54
commit d5d6bb7d39
1 changed files with 40 additions and 0 deletions

View File

@ -0,0 +1,40 @@
From f3d44aa4e5d440c4051ce8a77fb60cbdfb5442a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Mon, 7 Dec 2015 00:10:15 -0500
Subject: [PATCH 12/12] udev: fix NULL deref when executing rules
We quite obviously check whether event->dev_db is nonnull, and
right after that call a function which asserts the same. Move
the call under the same if.
https://bugzilla.redhat.com/show_bug.cgi?id=1283971
(cherry picked from commit 9eba69df1cd37c564e414165fd6e6314543427d9)
Resolves: #1283971
---
src/udev/udev-event.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index 4761222..eb5e74f 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -862,11 +862,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,
--
2.5.0