anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

Blame SOURCES/0311-device-Ensure-we-have-sysfs-path-before-comparing.patch

803fb7
From ce046ce7f8545d174dc8ecb45b27c2049d96f935 Mon Sep 17 00:00:00 2001
803fb7
From: Colin Guthrie <colin@mageia.org>
803fb7
Date: Mon, 14 Mar 2016 09:42:07 +0000
803fb7
Subject: [PATCH] device: Ensure we have sysfs path before comparing.
803fb7
803fb7
In some cases we do not have a udev device when setting up a unit
803fb7
(certainly the code gracefully handles this). However, we do
803fb7
then go on to compare the path via path_equal which will assert
803fb7
if a null value is passed in.
803fb7
803fb7
See https://bugs.mageia.org/show_bug.cgi?id=17766
803fb7
803fb7
Not sure if this is the correct fix, but it avoids the crash
803fb7
803fb7
Cherry-picked from: 5e1558f4a09e596561c9168384f2258e7c0718a1
803fb7
Resolves: #1332606
803fb7
---
803fb7
 src/core/device.c | 2 +-
803fb7
 1 file changed, 1 insertion(+), 1 deletion(-)
803fb7
803fb7
diff --git a/src/core/device.c b/src/core/device.c
803fb7
index fc73e263a..bdc8466ab 100644
803fb7
--- a/src/core/device.c
803fb7
+++ b/src/core/device.c
803fb7
@@ -319,7 +319,7 @@ static int device_setup_unit(Manager *m, struct udev_device *dev, const char *pa
803fb7
          * the GC to have garbaged it. That's desired since the device
803fb7
          * unit may have a dependency on the mount unit which was
803fb7
          * added during the loading of the later. */
803fb7
-        if (u && DEVICE(u)->state == DEVICE_PLUGGED) {
803fb7
+        if (sysfs && u && DEVICE(u)->state == DEVICE_PLUGGED) {
803fb7
                 /* This unit is in plugged state: we're sure it's
803fb7
                  * attached to a device. */
803fb7
                 if (!path_equal(DEVICE(u)->sysfs, sysfs)) {