summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorEric Paris2013-05-24 15:18:04 +0200
committerEric Paris2013-11-05 17:08:13 +0100
commitd040e5af380554c23ffe0a034ae5f3e53da93a1d (patch)
tree637a2e206c56b1cd2be32f8ef92bea19e25a3e9c /kernel
parentaudit: allow unsetting the loginuid (with priv) (diff)
downloadkernel-qcow2-linux-d040e5af380554c23ffe0a034ae5f3e53da93a1d.tar.gz
kernel-qcow2-linux-d040e5af380554c23ffe0a034ae5f3e53da93a1d.tar.xz
kernel-qcow2-linux-d040e5af380554c23ffe0a034ae5f3e53da93a1d.zip
audit: audit feature to only allow unsetting the loginuid
This is a new audit feature which only grants processes with CAP_AUDIT_CONTROL the ability to unset their loginuid. They cannot directly set it from a valid uid to another valid uid. The ability to unset the loginuid is nice because a priviledged task, like that of container creation, can unset the loginuid and then priv is not needed inside the container when a login daemon needs to set the loginuid. Signed-off-by: Eric Paris <eparis@redhat.com> Signed-off-by: Richard Guy Briggs <rgb@redhat.com> Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/audit.c3
-rw-r--r--kernel/auditsc.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/kernel/audit.c b/kernel/audit.c
index 29ee6a421c6c..fbfa3a74decb 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -144,7 +144,8 @@ static struct audit_features af = {.vers = AUDIT_FEATURE_VERSION,
.features = 0,
.lock = 0,};
-static char *audit_feature_names[0] = {
+static char *audit_feature_names[1] = {
+ "only_unset_loginuid",
};
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index c75d7813aef2..924c0bf048d2 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1974,6 +1974,9 @@ static int audit_set_loginuid_perm(kuid_t loginuid)
/* it is set, you need permission */
if (!capable(CAP_AUDIT_CONTROL))
return -EPERM;
+ /* reject if this is not an unset and we don't allow that */
+ if (is_audit_feature_set(AUDIT_FEATURE_ONLY_UNSET_LOGINUID) && uid_valid(loginuid))
+ return -EPERM;
return 0;
}