forked from pool/systemd
3856bb52b7
(please also push to 13.1, I want the same version as F20) - Add 0001-gpt-auto-generator-exit-immediately-if-in-container.patch: don't start gpt auto-generator in container (git). - Add 0001-manager-when-verifying-whether-clients-may-change-en.patch: fix reload check in selinux case (git). - Add 0001-logind-fix-bus-introspection-data-for-TakeControl.patch: fix introspection for TakeControl (git). - Add 0001-mount-check-for-NULL-before-reading-pm-what.patch: fix crash when parsing some incorrect unit (git). - Add 0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch: Fix udev rules parsing (git). - Add 0001-systemd-serialize-deserialize-forbid_restart-value.patch: Fix incorrect deserialization for forbid_restart (git). - Add 0001-core-unify-the-way-we-denote-serialization-attribute.patch: Ensure forbid_restart is named like other attributes (git). - Add 0001-journald-fix-minor-memory-leak.patch: fix memleak in journald (git). - Add 0001-do-not-accept-garbage-from-acpi-firmware-performance.patch: Improve ACPI firmware performance parsing (git). - Add 0001-journald-remove-rotated-file-from-hashmap-when-rotat.patch: Fix journal rotation (git). - Add 0001-login-fix-invalid-free-in-sd_session_get_vt.patch: Fix memory corruption in sd_session_get_vt (git). OBS-URL: https://build.opensuse.org/request/show/203387 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=454
30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
From 9c03872bc8fb2a381eafe7301ef9811b641686dd 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
|
|
|