summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>2016-11-14 06:12:56 -0500
committerCasey Schaufler <casey@schaufler-ca.com>2017-04-04 18:41:15 -0400
commitaf96f0d6394a0af59c4dd71d6bcd3b1ddfba5196 (patch)
treeb919dfda7beba06d3dd7a7ee74d40ea6c683bd0b
parentc3c8dc9f13e2e13013822ee54a529a6fe284f1e1 (diff)
Smack: Use GFP_KERNEL for smk_netlbl_mls().
Since all callers of smk_netlbl_mls() are GFP_KERNEL context (smk_set_cipso() calls memdup_user_nul(), init_smk_fs() calls __kernfs_new_node(), smk_import_entry() calls kzalloc(GFP_KERNEL)), it is safe to use GFP_KERNEL from netlbl_catmap_setbit(). Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
-rw-r--r--security/smack/smack_access.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c
index 356e3764cad9..a4b2e6b94abd 100644
--- a/security/smack/smack_access.c
+++ b/security/smack/smack_access.c
@@ -504,7 +504,7 @@ int smk_netlbl_mls(int level, char *catset, struct netlbl_lsm_secattr *sap,
504 if ((m & *cp) == 0) 504 if ((m & *cp) == 0)
505 continue; 505 continue;
506 rc = netlbl_catmap_setbit(&sap->attr.mls.cat, 506 rc = netlbl_catmap_setbit(&sap->attr.mls.cat,
507 cat, GFP_ATOMIC); 507 cat, GFP_KERNEL);
508 if (rc < 0) { 508 if (rc < 0) {
509 netlbl_catmap_free(sap->attr.mls.cat); 509 netlbl_catmap_free(sap->attr.mls.cat);
510 return rc; 510 return rc;