morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 16:37:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

sd-device: do not use ::subsystem member directly

Browse Source 
The value is set dynamically when sd_device_get_subsystem() is called
first time.

Fixes the following issue:
```
$ build/udevadm test /sys/class/block/dm-1
...
Assertion '_subsystem' failed at src/libsystemd/sd-device/sd-device.c:767, function device_set_subsystem(). Aborting.
Program received signal SIGABRT, Aborted.
```
This commit is contained in:
Yu Watanabe
2021-06-02 16:29:59 +09:00
parent f0273cba25
commit 2255e8adee
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libsystemd/sd-device/device-private.c
View File

@@ -743,6 +743,7 @@ int device_rename(sd_device *device, const char *name) {
int device_shallow_clone(sd_device *old_device, sd_device **new_device) {
_cleanup_(sd_device_unrefp) sd_device *ret = NULL;
const char *subsystem;
int r;
assert(old_device);
@@ -756,9 +757,12 @@ int device_shallow_clone(sd_device *old_device, sd_device **new_device) {
if (r < 0)
return r;
r = device_set_subsystem(ret, old_device->subsystem);
if (r < 0)
return r;
if (sd_device_get_subsystem(old_device, &subsystem) >= 0) {
r = device_set_subsystem(ret, subsystem);
if (r < 0)
return r;
} else
ret->subsystem_set = true;
ret->devnum = old_device->devnum;