mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
LSM: turn sb_eat_lsm_opts() into a method
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 <[email protected]> Signed-off-by: Al Viro <[email protected]>
This commit is contained in:
parent
6a0440e5b7
commit
5b40023911
4 changed files with 33 additions and 14 deletions
|
|
@ -739,6 +739,20 @@ out_err:
|
|||
return rc;
|
||||
}
|
||||
|
||||
static int smack_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 = smack_sb_copy_data(options, s);
|
||||
if (!err)
|
||||
err = smack_parse_opts_str(s, opts);
|
||||
free_page((unsigned long)s);
|
||||
return err;
|
||||
}
|
||||
|
||||
/**
|
||||
* smack_set_mnt_opts - set Smack specific mount options
|
||||
* @sb: the file system superblock
|
||||
|
|
@ -4637,7 +4651,7 @@ static struct security_hook_list smack_hooks[] __lsm_ro_after_init = {
|
|||
|
||||
LSM_HOOK_INIT(sb_alloc_security, smack_sb_alloc_security),
|
||||
LSM_HOOK_INIT(sb_free_security, smack_sb_free_security),
|
||||
LSM_HOOK_INIT(sb_copy_data, smack_sb_copy_data),
|
||||
LSM_HOOK_INIT(sb_eat_lsm_opts, smack_sb_eat_lsm_opts),
|
||||
LSM_HOOK_INIT(sb_statfs, smack_sb_statfs),
|
||||
LSM_HOOK_INIT(sb_set_mnt_opts, smack_set_mnt_opts),
|
||||
LSM_HOOK_INIT(sb_parse_opts_str, smack_parse_opts_str),
|
||||
|
|
|
|||
Loading…
Reference in a new issue