SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

smack: rework smack APIs a bit

Browse Source 
a) always return negative errno error codes
b) always become a noop if smack is off
c) always take a NULL label as a request to remove it
This commit is contained in:
Lennart Poettering
2014-10-23 21:36:56 +02:00
parent c80d766c80
commit d53e386db6
3 changed files with 81 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udev/udev-node.c
+7 -3
View File
@@ -294,21 +294,25 @@ static int node_permissions_apply(struct udev_device *dev, bool apply,
/* apply SECLABEL{$module}=$label */
udev_list_entry_foreach(entry, udev_list_get_entry(seclabel_list)) {
const char *name, *label;
int r;
name = udev_list_entry_get_name(entry);
label = udev_list_entry_get_value(entry);
if (streq(name, "selinux")) {
selinux = true;
if (mac_selinux_apply(devnode, label) < 0)
log_error("SECLABEL: failed to set SELinux label '%s'", label);
log_error("SECLABEL: failed to set SELinux label '%s': %s", label, strerror(-r));
else
log_debug("SECLABEL: set SELinux label '%s'", label);
} else if (streq(name, "smack")) {
smack = true;
if (mac_smack_apply(devnode, label) < 0)
log_error("SECLABEL: failed to set SMACK label '%s'", label);
r = mac_smack_apply(devnode, label);
if (r < 0)
log_error("SECLABEL: failed to set SMACK label '%s': %s", label, strerror(-r));
else
log_debug("SECLABEL: set SMACK label '%s'", label);