aboutsummaryrefslogtreecommitdiffstats
path: root/security/security.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2018-12-12 20:13:29 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2018-12-21 11:47:41 -0500
commit5b4002391153acebce2557af318bbdc17e235134 (patch)
treeb5c6afc5fbffd01ca682332e2893bad477e59b9d /security/security.c
parentnfs_remount(): don't leak, don't ignore LSM options quietly (diff)
downloadlinux-dev-5b4002391153acebce2557af318bbdc17e235134.tar.xz
linux-dev-5b4002391153acebce2557af318bbdc17e235134.zip
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 <dhowells@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security/security.c')
-rw-r--r--security/security.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/security/security.c b/security/security.c
index 3d8b72904e00..feb18c925349 100644
--- a/security/security.c
+++ b/security/security.c
@@ -386,16 +386,7 @@ void security_sb_free(struct super_block *sb)
int security_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 = call_int_hook(sb_copy_data, 0, options, s);
- if (!err)
- err = call_int_hook(sb_parse_opts_str, 0, s, opts);
- free_page((unsigned long)s);
- return err;
+ return call_int_hook(sb_eat_lsm_opts, 0, options, opts);
}
EXPORT_SYMBOL(security_sb_eat_lsm_opts);