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-29 19:21:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

LSM: lift extracting and parsing LSM options into the caller of ->sb_remount()

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 23:06:57 -05:00
commit c039bc3c24
5 changed files with 38 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

5
security/security.c
View file

@ -390,9 +390,10 @@ int security_sb_copy_data(char *orig, char *copy)
}
EXPORT_SYMBOL(security_sb_copy_data);
int security_sb_remount(struct super_block *sb, void *data)
int security_sb_remount(struct super_block *sb,
struct security_mnt_opts *opts)
{
return call_int_hook(sb_remount, 0, sb, data);
return call_int_hook(sb_remount, 0, sb, opts);
}
int security_sb_kern_mount(struct super_block *sb, int flags,

47
security/selinux/hooks.c
View file

@ -2812,39 +2812,22 @@ out:
return rc;
}
static int selinux_sb_remount(struct super_block *sb, void *data)
static int selinux_sb_remount(struct super_block *sb,
struct security_mnt_opts *opts)
{
int rc, i, *flags;
struct security_mnt_opts opts;
char *secdata, **mount_options;
int i, *flags;
char **mount_options;
struct superblock_security_struct *sbsec = sb->s_security;
if (!(sbsec->flags & SE_SBINITIALIZED))
return 0;
if (!data)
return 0;
mount_options = opts->mnt_opts;
flags = opts->mnt_opts_flags;
if (sb->s_type->fs_flags & FS_BINARY_MOUNTDATA)
return 0;
security_init_mnt_opts(&opts);
secdata = alloc_secdata();
if (!secdata)
return -ENOMEM;
rc = selinux_sb_copy_data(data, secdata);
if (rc)
goto out_free_secdata;
rc = selinux_parse_opts_str(secdata, &opts);
if (rc)
goto out_free_secdata;
mount_options = opts.mnt_opts;
flags = opts.mnt_opts_flags;
for (i = 0; i < opts.num_mnt_opts; i++) {
for (i = 0; i < opts->num_mnt_opts; i++) {
u32 sid;
int rc;
if (flags[i] == SBLABEL_MNT)
continue;
@ -2855,9 +2838,8 @@ static int selinux_sb_remount(struct super_block *sb, void *data)
pr_warn("SELinux: security_context_str_to_sid"
"(%s) failed for (dev %s, type %s) errno=%d\n",
mount_options[i], sb->s_id, sb->s_type->name, rc);
goto out_free_opts;
return rc;
}
rc = -EINVAL;
switch (flags[i]) {
case FSCONTEXT_MNT:
if (bad_option(sbsec, FSCONTEXT_MNT, sbsec->sid, sid))
@ -2880,21 +2862,16 @@ static int selinux_sb_remount(struct super_block *sb, void *data)
goto out_bad_option;
break;
default:
goto out_free_opts;
return -EINVAL;
}
}
return 0;
rc = 0;
out_free_opts:
security_free_mnt_opts(&opts);
out_free_secdata:
free_secdata(secdata);
return rc;
out_bad_option:
pr_warn("SELinux: unable to change security options "
"during remount (dev %s, type=%s)\n", sb->s_id,
sb->s_type->name);
goto out_free_opts;
return -EINVAL;
}
static int selinux_sb_kern_mount(struct super_block *sb, int flags,