github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-12 16:18:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

selinux: shrink critical section in sel_write_load()

Browse Source 
Currently sel_write_load() takes the policy mutex earlier than
necessary. Move the taking of the mutex later. This avoids
holding it unnecessarily across the vmalloc() and copy_from_user()
of the policy data.

Cc: stable@vger.kernel.org
Signed-off-by: Stephen Smalley <stephen.smalley.work@gmail.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
This commit is contained in:
Stephen Smalley 2026-04-30 14:36:52 -04:00 committed by Paul Moore
parent a02cd68055
commit 868f31e406
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
security/selinux/selinuxfs.c
View File

@ -553,34 +553,31 @@ static ssize_t sel_write_load(struct file *file, const char __user *buf,
if (!count) if (!count)
return -EINVAL; return -EINVAL;
mutex_lock(&selinux_state.policy_mutex);
length = avc_has_perm(current_sid(), SECINITSID_SECURITY, length = avc_has_perm(current_sid(), SECINITSID_SECURITY,
SECCLASS_SECURITY, SECURITY__LOAD_POLICY, NULL); SECCLASS_SECURITY, SECURITY__LOAD_POLICY, NULL);
if (length) if (length)
goto out; return length;
data = vmalloc(count); data = vmalloc(count);
if (!data) { if (!data)
length = -ENOMEM; return -ENOMEM;
goto out;
}
if (copy_from_user(data, buf, count) != 0) { if (copy_from_user(data, buf, count) != 0) {
length = -EFAULT; length = -EFAULT;
goto out; goto out;
} }
mutex_lock(&selinux_state.policy_mutex);
length = security_load_policy(data, count, &load_state); length = security_load_policy(data, count, &load_state);
if (length) { if (length) {
pr_warn_ratelimited("SELinux: failed to load policy\n"); pr_warn_ratelimited("SELinux: failed to load policy\n");
goto out; goto out_unlock;
} }
fsi = file_inode(file)->i_sb->s_fs_info; fsi = file_inode(file)->i_sb->s_fs_info;
length = sel_make_policy_nodes(fsi, load_state.policy); length = sel_make_policy_nodes(fsi, load_state.policy);
if (length) { if (length) {
pr_warn_ratelimited("SELinux: failed to initialize selinuxfs\n"); pr_warn_ratelimited("SELinux: failed to initialize selinuxfs\n");
selinux_policy_cancel(&load_state); selinux_policy_cancel(&load_state);
goto out; goto out_unlock;
} }
selinux_policy_commit(&load_state); selinux_policy_commit(&load_state);
@ -590,8 +587,9 @@ static ssize_t sel_write_load(struct file *file, const char __user *buf,
from_kuid(&init_user_ns, audit_get_loginuid(current)), from_kuid(&init_user_ns, audit_get_loginuid(current)),
audit_get_sessionid(current)); audit_get_sessionid(current));
out: out_unlock:
mutex_unlock(&selinux_state.policy_mutex); mutex_unlock(&selinux_state.policy_mutex);
out:
vfree(data); vfree(data);
return length; return length;
} }