diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-03-27 07:38:26 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-03-27 07:38:26 +0200 |
| commit | 08c849815c8db19ab0ab1ca226354d4a104041f0 (patch) | |
| tree | 8e7004dc8d46fd9f5ddbca3d9f855b7c83433653 /src/udev | |
| parent | ffb3c2bd705409ca5bbbb9ccef4c59349ea787cf (diff) | |
| download | systemd-08c849815c8db19ab0ab1ca226354d4a104041f0.tar.gz | |
label: rework label_fix() implementations (#8583)
This reworks the SELinux and SMACK label fixing calls in a number of
ways:
1. The two separate boolean arguments of these functions are converted
into a flags type LabelFixFlags.
2. The operations are now implemented based on O_PATH. This should
resolve TTOCTTOU races between determining the label for the file
system object and applying it, as it it allows to pin the object
while we are operating on it.
3. When changing a label fails we'll query the label previously set, and
if matches what we want to set anyway we'll suppress the error.
Also, all calls to label_fix() are now (void)ified, when we ignore the
return values.
Fixes: #8566
Diffstat (limited to 'src/udev')
| -rw-r--r-- | src/udev/udev-node.c | 4 | ||||
| -rw-r--r-- | src/udev/udevadm-hwdb.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c index 6a3ee93ca2..755bf665ab 100644 --- a/src/udev/udev-node.c +++ b/src/udev/udev-node.c @@ -79,7 +79,7 @@ static int node_symlink(struct udev_device *dev, const char *node, const char *s buf[len] = '\0'; if (streq(target, buf)) { log_debug("preserve already existing symlink '%s' to '%s'", slink, target); - label_fix(slink, true, false); + (void) label_fix(slink, LABEL_IGNORE_ENOENT); utimensat(AT_FDCWD, slink, NULL, AT_SYMLINK_NOFOLLOW); goto exit; } @@ -324,7 +324,7 @@ static int node_permissions_apply(struct udev_device *dev, bool apply, /* set the defaults */ if (!selinux) - mac_selinux_fix(devnode, true, false); + (void) mac_selinux_fix(devnode, LABEL_IGNORE_ENOENT); if (!smack) mac_smack_apply(devnode, SMACK_ATTR_ACCESS, NULL); } diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c index dc3ae7484d..3a5b138b31 100644 --- a/src/udev/udevadm-hwdb.c +++ b/src/udev/udevadm-hwdb.c @@ -680,7 +680,7 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) { rc = EXIT_FAILURE; } - label_fix(hwdb_bin, false, false); + (void) label_fix(hwdb_bin, 0); } if (test) { |