30 lines
1 KiB
Diff
30 lines
1 KiB
Diff
|
From 61ccd1762fa0f9a8ec9285a8a7367fc03bcc5982 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dave Reisner <dreisner@archlinux.org>
|
||
|
|
Date: Fri, 4 Oct 2013 18:22:40 -0400
|
||
|
|
Subject: [PATCH] mount: check for NULL before reading pm->what
|
||
|
|
|
||
|
|
Since a57f7e2c828b85, a mount unit with garbage in it would cause
|
||
|
|
systemd to crash on loading it.
|
||
|
|
|
||
|
|
ref: https://bugs.freedesktop.org/show_bug.cgi?id=70148
|
||
|
|
---
|
||
|
|
src/core/mount.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/core/mount.c b/src/core/mount.c
|
||
|
|
index 93bfa99..db055f0 100644
|
||
|
|
--- a/src/core/mount.c
|
||
|
|
+++ b/src/core/mount.c
|
||
|
|
@@ -182,7 +182,7 @@ static int mount_add_mount_links(Mount *m) {
|
||
|
|
* for the source path (if this is a bind mount) to be
|
||
|
|
* available. */
|
||
|
|
pm = get_mount_parameters_fragment(m);
|
||
|
|
- if (pm && path_is_absolute(pm->what)) {
|
||
|
|
+ if (pm && pm->what && path_is_absolute(pm->what)) {
|
||
|
|
r = unit_require_mounts_for(UNIT(m), pm->what);
|
||
|
|
if (r < 0)
|
||
|
|
return r;
|
||
|
|
--
|
||
|
|
1.8.4.652.g0d6e0ce
|
||
|
|
|