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

Merge pull request #27220 from yuwata/sd-device-follow-ups-for-devlink

Browse Source 
sd-device: several follow-ups about devlink creation
This commit is contained in:
Daan De Meyer 2023-04-12 11:49:08 +02:00 committed by GitHub
commit ea24ed79f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -569,6 +569,32 @@ int device_set_ifindex(sd_device *device, const char *name) {
return 0;
}
static int mangle_devname(const char *p, char **ret) {
char *q;
assert(p);
assert(ret);
if (!path_is_safe(p))
return -EINVAL;
/* When the path is absolute, it must start with "/dev/", but ignore "/dev/" itself. */
if (path_is_absolute(p)) {
if (isempty(path_startswith(p, "/dev/")))
return -EINVAL;
q = strdup(p);
} else
q = path_join("/dev/", p);
if (!q)
return -ENOMEM;
path_simplify(q);
*ret = q;
return 0;
}
int device_set_devname(sd_device *device, const char *devname) {
_cleanup_free_ char *t = NULL;
int r;
@ -576,12 +602,9 @@ int device_set_devname(sd_device *device, const char *devname) {
assert(device);
assert(devname);
if (devname[0] != '/')
t = strjoin("/dev/", devname);
else
t = strdup(devname);
if (!t)
return -ENOMEM;
r = mangle_devname(devname, &t);
if (r < 0)
return r;
r = device_add_property_internal(device, "DEVNAME", t);
if (r < 0)
@ -1326,7 +1349,7 @@ _public_ int sd_device_get_devname(sd_device *device, const char **devname) {
if (!device->devname)
return -ENOENT;
assert(path_startswith(device->devname, "/dev/"));
assert(!isempty(path_startswith(device->devname, "/dev/")));
if (devname)
*devname = device->devname;
@ -1473,15 +1496,6 @@ int device_add_tag(sd_device *device, const char *tag, bool both) {
return 0;
}
static char *prefix_dev(const char *p) {
assert(p);
if (path_startswith(p, "/dev/"))
return strdup(p);
return path_join("/dev/", p);
}
int device_add_devlink(sd_device *device, const char *devlink) {
char *p;
int r;
@ -1489,14 +1503,9 @@ int device_add_devlink(sd_device *device, const char *devlink) {
assert(device);
assert(devlink);
if (!path_is_safe(devlink))
return -EINVAL;
p = prefix_dev(devlink);
if (!p)
return -ENOMEM;
path_simplify(p);
r = mangle_devname(devlink, &p);
if (r < 0)
return r;
r = set_ensure_consume(&device->devlinks, &path_hash_ops_free, p);
if (r < 0)
@ -1510,13 +1519,14 @@ int device_add_devlink(sd_device *device, const char *devlink) {
int device_remove_devlink(sd_device *device, const char *devlink) {
_cleanup_free_ char *p = NULL, *s = NULL;
int r;
assert(device);
assert(devlink);
p = prefix_dev(devlink);
if (!p)
return -ENOMEM;
r = mangle_devname(devlink, &p);
if (r < 0)
return r;
s = set_remove(device->devlinks, p);
if (!s)

15
test/udev-test.pl
View File

@ -226,18 +226,25 @@ EOF
{
devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
exp_links => ["link1", "link2/foo", "link3/aaa/bbb",
"abs1", "abs2/foo", "abs3/aaa/bbb",
"default___replace_test/foo_aaa",
"string_escape___replace/foo_bbb",
"env_with_space",
"default/replace/mode_foo__hoge",
"replace_env_harder_foo__hoge"],
not_exp_links => ["removed", "unsafe/../../path"],
not_exp_links => ["removed1", "removed2", "removed3", "unsafe/../../path", "/nondev/path/will/be/refused"],
}],
rules => <<EOF
SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", SYMLINK+="removed"
SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", SYMLINK-="removed"
SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", SYMLINK+="removed1"
SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", SYMLINK-="removed1"
SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", SYMLINK+="/./dev///removed2"
SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", SYMLINK-="removed2"
SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", SYMLINK+="././removed3"
SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", SYMLINK-="/dev//./removed3/./"
SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", SYMLINK+="unsafe/../../path"
SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", SYMLINK+="link1 link2/foo link3/aaa/bbb"
SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", SYMLINK+="/nondev/path/will/be/refused"
SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", SYMLINK+="link1 .///link2/././/foo//./ .///link3/aaa/bbb"
SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", SYMLINK+="/dev/abs1 /dev//./abs2///foo/./ ////dev/abs3/aaa/bbb"
SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", SYMLINK+="default?;;replace%%test/foo'aaa"
SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", OPTIONS="string_escape=replace", SYMLINK+="string_escape replace/foo%%bbb"
SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", ENV{.HOGE}="env with space", SYMLINK+="%E{.HOGE}"