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

Merge c9d35ee049 ("Merge branch 'merge.nfs-fs_parse.1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs") into android-mainline

Browse Source 
Tiny steps to deal with merge issues in sdcardfs due to fs param passing
api changes.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I03ba8763e8cc324c25fb6316c363b59957103474
This commit is contained in:
Greg Kroah-Hartman
2020-02-10 08:31:34 -08:00
parent 32aad4282b c9d35ee049
commit aa601dde64
37 changed files with 562 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
security/selinux/hooks.c
View File

@@ -2781,7 +2781,7 @@ static int selinux_fs_context_dup(struct fs_context *fc,
return 0;
}
static const struct fs_parameter_spec selinux_param_specs[] = {
static const struct fs_parameter_spec selinux_fs_parameters[] = {
fsparam_string(CONTEXT_STR, Opt_context),
fsparam_string(DEFCONTEXT_STR, Opt_defcontext),
fsparam_string(FSCONTEXT_STR, Opt_fscontext),
@@ -2790,18 +2790,13 @@ static const struct fs_parameter_spec selinux_param_specs[] = {
{}
};
static const struct fs_parameter_description selinux_fs_parameters = {
.name = "SELinux",
.specs = selinux_param_specs,
};
static int selinux_fs_context_parse_param(struct fs_context *fc,
struct fs_parameter *param)
{
struct fs_parse_result result;
int opt, rc;
opt = fs_parse(fc, &selinux_fs_parameters, param, &result);
opt = fs_parse(fc, selinux_fs_parameters, param, &result);
if (opt < 0)
return opt;
@@ -7166,7 +7161,7 @@ static __init int selinux_init(void)
else
pr_debug("SELinux: Starting in permissive mode\n");
fs_validate_description(&selinux_fs_parameters);
fs_validate_description("selinux", selinux_fs_parameters);
return 0;
}