A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 10:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

LSM: lift parsing LSM options into the caller of ->sb_kern_mount()

Browse source 
This paves the way for retaining the LSM options from a common filesystem
mount context during a mount parameter parsing phase to be instituted prior
to actual mount/reconfiguration actions.

Reviewed-by: David Howells <[email protected]>
Signed-off-by: Al Viro <[email protected]>
This commit is contained in:
Al Viro 2018-12-01 22:42:44 -05:00
commit 6be8750b4c
6 changed files with 31 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

5
security/security.c
View file

@ -395,9 +395,10 @@ int security_sb_remount(struct super_block *sb, void *data)
return call_int_hook(sb_remount, 0, sb, data);
}
int security_sb_kern_mount(struct super_block *sb, int flags, void *data)
int security_sb_kern_mount(struct super_block *sb, int flags,
struct security_mnt_opts *opts)
{
return call_int_hook(sb_kern_mount, 0, sb, flags, data);
return call_int_hook(sb_kern_mount, 0, sb, flags, opts);
}
int security_sb_show_options(struct seq_file *m, struct super_block *sb)

24
security/selinux/hooks.c
View file

@ -2897,30 +2897,12 @@ out_bad_option:
goto out_free_opts;
}
static int selinux_sb_kern_mount(struct super_block *sb, int flags, void *data)
static int selinux_sb_kern_mount(struct super_block *sb, int flags,
struct security_mnt_opts *opts)
{
char *options = data;
const struct cred *cred = current_cred();
struct common_audit_data ad;
int rc = 0;
struct security_mnt_opts opts;
security_init_mnt_opts(&opts);
if (!data)
goto out;
BUG_ON(sb->s_type->fs_flags & FS_BINARY_MOUNTDATA);
rc = selinux_parse_opts_str(options, &opts);
if (rc)
goto out_err;
out:
rc = selinux_set_mnt_opts(sb, &opts, 0, NULL);
out_err:
security_free_mnt_opts(&opts);
int rc = selinux_set_mnt_opts(sb, opts, 0, NULL);
if (rc)
return rc;

23
security/smack/smack_lsm.c
View file

@ -859,27 +859,10 @@ static int smack_set_mnt_opts(struct super_block *sb,
*
* Returns 0 on success, an error code on failure
*/
static int smack_sb_kern_mount(struct super_block *sb, int flags, void *data)
static int smack_sb_kern_mount(struct super_block *sb, int flags,
struct security_mnt_opts *opts)
{
int rc = 0;
char *options = data;
struct security_mnt_opts opts;
security_init_mnt_opts(&opts);
if (!options)
goto out;
rc = smack_parse_opts_str(options, &opts);
if (rc)
goto out_err;
out:
rc = smack_set_mnt_opts(sb, &opts, 0, NULL);
out_err:
security_free_mnt_opts(&opts);
return rc;
return smack_set_mnt_opts(sb, opts, 0, NULL);
}
/**