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

sd-device: refuse block device without subsystem

Browse Source 
Previously, even if sd_device_get_subsystem() returns -ENOENT for block
device, we accepted that. This makes the check slightly stricter.
This commit is contained in:
Yu Watanabe 2022-09-18 09:03:05 +09:00 committed by Lennart Poettering
parent 4f0d1cd011
commit 23d3dfc369
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsystemd/sd-device/sd-device.c
View File

@ -281,7 +281,7 @@ _public_ int sd_device_new_from_syspath(sd_device **ret, const char *syspath) {
int device_new_from_mode_and_devnum(sd_device **ret, mode_t mode, dev_t devnum) {
_cleanup_(sd_device_unrefp) sd_device *dev = NULL;
_cleanup_free_ char *syspath = NULL;
const char *t, *subsystem;
const char *t, *subsystem = NULL;
dev_t n;
int r;
@ -315,7 +315,7 @@ int device_new_from_mode_and_devnum(sd_device **ret, mode_t mode, dev_t devnum)
r = sd_device_get_subsystem(dev, &subsystem);
if (r < 0 && r != -ENOENT)
return r;
if (r >= 0 && streq(subsystem, "block") != !!S_ISBLK(mode))
if (streq_ptr(subsystem, "block") != !!S_ISBLK(mode))
return -ENXIO;
*ret = TAKE_PTR(dev);