leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'smack-for-4.12' of git://github.com/cschaufler/smack-next into next

Browse Source
This commit is contained in:
James Morris 2017-04-19 08:35:01 +10:00
commit 6859e21e81
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/smack/smack_access.c
View File

@ -504,7 +504,7 @@ int smk_netlbl_mls(int level, char *catset, struct netlbl_lsm_secattr *sap,
if ((m & *cp) == 0) if ((m & *cp) == 0)
continue; continue;
rc = netlbl_catmap_setbit(&sap->attr.mls.cat, rc = netlbl_catmap_setbit(&sap->attr.mls.cat,
cat, GFP_ATOMIC); cat, GFP_KERNEL);
if (rc < 0) { if (rc < 0) {
netlbl_catmap_free(sap->attr.mls.cat); netlbl_catmap_free(sap->attr.mls.cat);
return rc; return rc;

4
security/smack/smack_lsm.c
View File

@ -695,10 +695,8 @@ static int smack_parse_opts_str(char *options,
opts->mnt_opts_flags = kcalloc(NUM_SMK_MNT_OPTS, sizeof(int), opts->mnt_opts_flags = kcalloc(NUM_SMK_MNT_OPTS, sizeof(int),
GFP_KERNEL); GFP_KERNEL);
if (!opts->mnt_opts_flags) { if (!opts->mnt_opts_flags)
kfree(opts->mnt_opts);
goto out_err; goto out_err;
}
if (fsdefault) { if (fsdefault) {
opts->mnt_opts[num_mnt_opts] = fsdefault; opts->mnt_opts[num_mnt_opts] = fsdefault;