Merge tag 'selinux-pr-20200210' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull SELinux fixes from Paul Moore:
 "Two small fixes: one fixes a locking problem in the recently merged
  label translation code, the other fixes an embarrassing 'binderfs' /
  'binder' filesystem name check"

* tag 'selinux-pr-20200210' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  selinux: fix sidtab string cache locking
  selinux: fix typo in filesystem name

diff --combined security/selinux/hooks.c
index 4b6991e178d37e5916f33bb6ec3911aa550985c7,6ef606a3c7f99d7865ccb19a9e018e0374bf171a..1659b59fb5d77d10736cb2aa6f63c7c90aebdaaa
--- 1/security/selinux/hooks.c
--- 2/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@@ -698,7 -698,7 +698,7 @@@ static int selinux_set_mnt_opts(struct 
  
        if (!strcmp(sb->s_type->name, "debugfs") ||
            !strcmp(sb->s_type->name, "tracefs") ||
-           !strcmp(sb->s_type->name, "binderfs") ||
+           !strcmp(sb->s_type->name, "binder") ||
            !strcmp(sb->s_type->name, "pstore"))
                sbsec->flags |= SE_SBGENFS;
  
@@@ -2778,7 -2778,7 +2778,7 @@@ static int selinux_fs_context_dup(struc
        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),
@@@ -2787,13 -2787,18 +2787,13 @@@
        {}
  };
  
 -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;
  
@@@ -7188,7 -7193,7 +7188,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;
  }