diff options
author | Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> | 2016-11-14 06:12:55 -0500 |
---|---|---|
committer | Casey Schaufler <casey@schaufler-ca.com> | 2016-11-14 15:55:11 -0500 |
commit | 8c15d66e429afd099b66f05393527c23f85ca41c (patch) | |
tree | dda9eea10b14612ff26af6c671efddfc113810f8 | |
parent | 2e4939f7026f938a1dc81533d020801198562804 (diff) |
Smack: Use GFP_KERNEL for smack_parse_opts_str().
Since smack_parse_opts_str() is calling match_strdup() which uses
GFP_KERNEL, it is safe to use GFP_KERNEL from kcalloc() which is
called by smack_parse_opts_str().
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Acked-by: Casey Schaufler <casey@schaufler-ca.com>
-rw-r--r-- | security/smack/smack_lsm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index b2c839f735c0..46d8be434466 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c | |||
@@ -692,12 +692,12 @@ static int smack_parse_opts_str(char *options, | |||
692 | } | 692 | } |
693 | } | 693 | } |
694 | 694 | ||
695 | opts->mnt_opts = kcalloc(NUM_SMK_MNT_OPTS, sizeof(char *), GFP_ATOMIC); | 695 | opts->mnt_opts = kcalloc(NUM_SMK_MNT_OPTS, sizeof(char *), GFP_KERNEL); |
696 | if (!opts->mnt_opts) | 696 | if (!opts->mnt_opts) |
697 | goto out_err; | 697 | goto out_err; |
698 | 698 | ||
699 | opts->mnt_opts_flags = kcalloc(NUM_SMK_MNT_OPTS, sizeof(int), | 699 | opts->mnt_opts_flags = kcalloc(NUM_SMK_MNT_OPTS, sizeof(int), |
700 | GFP_ATOMIC); | 700 | GFP_KERNEL); |
701 | if (!opts->mnt_opts_flags) { | 701 | if (!opts->mnt_opts_flags) { |
702 | kfree(opts->mnt_opts); | 702 | kfree(opts->mnt_opts); |
703 | goto out_err; | 703 | goto out_err; |