Blame 0018-device-Avoid-calling-unit_free-NULL-in-device-setup-.patch
|
 |
5d6eedd |
From 9dd94c0ac4b29250e0c06f2bbd8e73cc2072da7d Mon Sep 17 00:00:00 2001
|
|
|
03e93e2 |
From: Dave Reisner <d@falconindy.com>
|
|
|
03e93e2 |
Date: Sun, 27 Nov 2016 17:05:39 -0500
|
|
|
03e93e2 |
Subject: [PATCH] device: Avoid calling unit_free(NULL) in device setup logic
|
|
|
03e93e2 |
(#4748)
|
|
|
03e93e2 |
|
|
|
03e93e2 |
Since a581e45ae8f9bb5c, there's a few function calls to
|
|
|
03e93e2 |
unit_new_for_name which will unit_free on failure. Prior to this commit,
|
|
|
03e93e2 |
a failure would result in calling unit_free with a NULL unit, and hit an
|
|
|
03e93e2 |
assertion failure, seen at least via device_setup_unit:
|
|
|
03e93e2 |
|
|
|
03e93e2 |
Assertion 'u' failed at src/core/unit.c:519, function unit_free(). Aborting.
|
|
|
03e93e2 |
|
|
|
03e93e2 |
Fixes #4747
|
|
|
03e93e2 |
https://bugs.archlinux.org/task/51950
|
|
|
03e93e2 |
(cherry picked from commit d112eae7da77899be245ab52aa1747d4675549f1)
|
|
|
03e93e2 |
---
|
|
|
03e93e2 |
src/core/device.c | 2 +-
|
|
|
03e93e2 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
03e93e2 |
|
|
|
03e93e2 |
diff --git a/src/core/device.c b/src/core/device.c
|
|
|
03e93e2 |
index bd87a447cd..4b9e84aeb6 100644
|
|
|
03e93e2 |
--- a/src/core/device.c
|
|
|
03e93e2 |
+++ b/src/core/device.c
|
|
|
03e93e2 |
@@ -365,7 +365,7 @@ static int device_setup_unit(Manager *m, struct udev_device *dev, const char *pa
|
|
|
03e93e2 |
fail:
|
|
|
03e93e2 |
log_unit_warning_errno(u, r, "Failed to set up device unit: %m");
|
|
|
03e93e2 |
|
|
|
03e93e2 |
- if (delete)
|
|
|
03e93e2 |
+ if (delete && u)
|
|
|
03e93e2 |
unit_free(u);
|
|
|
03e93e2 |
|
|
|
03e93e2 |
return r;
|