shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

sd-device: refuse O_DIRECTORY returned from path_extract_filename()

Browse Source 
In both cases, it is expected that the symlink targets do not end with '/'.

Addresses https://github.com/systemd/systemd/pull/23089#discussion_r853007218.
This commit is contained in:
Yu Watanabe 2022-04-20 01:43:11 +09:00
parent bb60956b39
commit e4e1353c25
1 changed files with 4 additions and 0 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

@ -1181,6 +1181,8 @@ static int device_set_sysname_and_sysnum(sd_device *device) {
r = path_extract_filename(device->devpath, &sysname);
if (r < 0)
return r;
if (r == O_DIRECTORY)
return -EINVAL;
/* some devices have '!' in their name, change that to '/' */
for (p = strchrnul(sysname, '!'); *p != '\0'; p = strchrnul(p, '!'))
@ -1457,6 +1459,8 @@ int device_get_device_id(sd_device *device, const char **ret) {
r = path_extract_filename(device->devpath, &sysname);
if (r < 0)
return r;
if (r == O_DIRECTORY)
return -EINVAL;
if (streq(subsystem, "drivers")) {
/* the 'drivers' pseudo-subsystem is special, and needs the real