aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--security/smack/smack_lsm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index df45d393918..5f80075d771 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -79,7 +79,7 @@ struct inode_smack *new_inode_smack(char *smack)
79{ 79{
80 struct inode_smack *isp; 80 struct inode_smack *isp;
81 81
82 isp = kzalloc(sizeof(struct inode_smack), GFP_KERNEL); 82 isp = kzalloc(sizeof(struct inode_smack), GFP_NOFS);
83 if (isp == NULL) 83 if (isp == NULL)
84 return NULL; 84 return NULL;
85 85
@@ -563,7 +563,7 @@ static int smack_inode_init_security(struct inode *inode, struct inode *dir,
563 int may; 563 int may;
564 564
565 if (name) { 565 if (name) {
566 *name = kstrdup(XATTR_SMACK_SUFFIX, GFP_KERNEL); 566 *name = kstrdup(XATTR_SMACK_SUFFIX, GFP_NOFS);
567 if (*name == NULL) 567 if (*name == NULL)
568 return -ENOMEM; 568 return -ENOMEM;
569 } 569 }
@@ -586,7 +586,7 @@ static int smack_inode_init_security(struct inode *inode, struct inode *dir,
586 issp->smk_flags |= SMK_INODE_CHANGED; 586 issp->smk_flags |= SMK_INODE_CHANGED;
587 } 587 }
588 588
589 *value = kstrdup(isp, GFP_KERNEL); 589 *value = kstrdup(isp, GFP_NOFS);
590 if (*value == NULL) 590 if (*value == NULL)
591 return -ENOMEM; 591 return -ENOMEM;
592 } 592 }
@@ -3426,7 +3426,7 @@ static int smack_audit_rule_match(u32 secid, u32 field, u32 op, void *vrule,
3426 char *rule = vrule; 3426 char *rule = vrule;
3427 3427
3428 if (!rule) { 3428 if (!rule) {
3429 audit_log(actx, GFP_KERNEL, AUDIT_SELINUX_ERR, 3429 audit_log(actx, GFP_ATOMIC, AUDIT_SELINUX_ERR,
3430 "Smack: missing rule\n"); 3430 "Smack: missing rule\n");
3431 return -ENOENT; 3431 return -ENOENT;
3432 } 3432 }