xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LSM: turn sb_eat_lsm_opts() into a method

Browse Source 
Kill ->sb_copy_data() - it's used only in combination with immediately
following ->sb_parse_opts_str().  Turn that combination into a new
method.

This is just a mechanical move - cleanups will be the next step.

Reviewed-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2018-12-12 20:13:29 -05:00
parent 6a0440e5b7
commit 5b40023911
4 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
security/selinux/hooks.c
View File

@@ -2810,6 +2810,20 @@ out:
return rc;
}
static int selinux_sb_eat_lsm_opts(char *options, struct security_mnt_opts *opts)
{
char *s = (char *)get_zeroed_page(GFP_KERNEL);
int err;
if (!s)
return -ENOMEM;
err = selinux_sb_copy_data(options, s);
if (!err)
err = selinux_parse_opts_str(s, opts);
free_page((unsigned long)s);
return err;
}
static int selinux_sb_remount(struct super_block *sb,
struct security_mnt_opts *opts)
{
@@ -6863,7 +6877,7 @@ static struct security_hook_list selinux_hooks[] __lsm_ro_after_init = {
LSM_HOOK_INIT(sb_alloc_security, selinux_sb_alloc_security),
LSM_HOOK_INIT(sb_free_security, selinux_sb_free_security),
LSM_HOOK_INIT(sb_copy_data, selinux_sb_copy_data),
LSM_HOOK_INIT(sb_eat_lsm_opts, selinux_sb_eat_lsm_opts),
LSM_HOOK_INIT(sb_remount, selinux_sb_remount),
LSM_HOOK_INIT(sb_kern_mount, selinux_sb_kern_mount),
LSM_HOOK_INIT(sb_show_options, selinux_sb_show_options),