shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-13 12:58:20 +03:00
Code

mount: don't call sd_device_get_property_value() with a NULL pointer

Browse Source 
Otherwise bad thing would've happened is this was a hard assert:

+ systemd-mount --umount /dev/loop0
Assertion 'device' failed at src/libsystemd/sd-device/sd-device.c:2202, function sd_device_get_property_value(). Ignoring.

(cherry picked from commit 6e07f600ba9204d9b01c401b21531ebdba15322e)
(cherry picked from commit 432735598e2acaa3be6f3e7c29f6cf9712f56b97)
This commit is contained in:
Frantisek Sumsal 2023-11-15 13:46:09 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent ffcbf5d05d
commit c6e8898672
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mount/mount-tool.c
View File

@ -913,7 +913,6 @@ static int stop_mounts(
}
static int umount_by_device(sd_bus *bus, sd_device *dev) {
_cleanup_(sd_device_unrefp) sd_device *d = NULL;
_cleanup_strv_free_ char **list = NULL;
const char *v;
int r, ret = 0;
@ -921,7 +920,7 @@ static int umount_by_device(sd_bus *bus, sd_device *dev) {
assert(bus);
assert(dev);
if (sd_device_get_property_value(d, "SYSTEMD_MOUNT_WHERE", &v) >= 0)
if (sd_device_get_property_value(dev, "SYSTEMD_MOUNT_WHERE", &v) >= 0)
ret = stop_mounts(bus, v);
r = sd_device_get_devname(dev, &v);