From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
Date: Wed, 6 May 2015 17:56:29 +0000 (+0200)
Subject: device: avoid null pointer dereference
X-Git-Tag: v220~182
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f629b74c4adc483dd5733bd9191b58cfbdd157f;p=thirdparty%2Fsystemd.git

device: avoid null pointer dereference
---

diff --git a/src/core/device.c b/src/core/device.c
index 2c56c5a2d2b..c09ea6c197a 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -310,7 +310,7 @@ static int device_setup_unit(Manager *m, struct udev_device *dev, const char *pa
 
         r = unit_name_from_path(path, ".device", &e);
         if (r < 0)
-                return log_unit_error_errno(u->id, r, "Failed to generate device name: %m");
+                return log_error_errno(r, "Failed to generate unit name from device path: %m");
 
         u = manager_get_unit(m, e);