Commit 005fa17c authored by Ondrej Mosnacek's avatar Ondrej Mosnacek Committed by Greg Kroah-Hartman

selinux: fix empty write to keycreate file

[ Upstream commit 464c258a ]

When sid == 0 (we are resetting keycreate_sid to the default value), we
should skip the KEY__CREATE check.

Before this patch, doing a zero-sized write to /proc/self/keycreate
would check if the current task can create unlabeled keys (which would
usually fail with -EACCESS and generate an AVC). Now it skips the check
and correctly sets the task's keycreate_sid to 0.

Bug report: https://bugzilla.redhat.com/show_bug.cgi?id=1719067

Tested using the reproducer from the report above.

Fixes: 4eb582cf ("[PATCH] keys: add a way to store the appropriate context for newly-created keys")
Reported-by: default avatarKir Kolyshkin <kir@sacred.ru>
Signed-off-by: default avatarOndrej Mosnacek <omosnace@redhat.com>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1e1b3544
...@@ -6269,11 +6269,12 @@ static int selinux_setprocattr(const char *name, void *value, size_t size) ...@@ -6269,11 +6269,12 @@ static int selinux_setprocattr(const char *name, void *value, size_t size)
} else if (!strcmp(name, "fscreate")) { } else if (!strcmp(name, "fscreate")) {
tsec->create_sid = sid; tsec->create_sid = sid;
} else if (!strcmp(name, "keycreate")) { } else if (!strcmp(name, "keycreate")) {
error = avc_has_perm(&selinux_state, if (sid) {
mysid, sid, SECCLASS_KEY, KEY__CREATE, error = avc_has_perm(&selinux_state, mysid, sid,
NULL); SECCLASS_KEY, KEY__CREATE, NULL);
if (error) if (error)
goto abort_change; goto abort_change;
}
tsec->keycreate_sid = sid; tsec->keycreate_sid = sid;
} else if (!strcmp(name, "sockcreate")) { } else if (!strcmp(name, "sockcreate")) {
tsec->sockcreate_sid = sid; tsec->sockcreate_sid = sid;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment