Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8931c3bd authored by Tetsuo Handa's avatar Tetsuo Handa Committed by Paul Moore
Browse files

SELinux: Use GFP_KERNEL for selinux_parse_opts_str(). 



Since selinux_parse_opts_str() is calling match_strdup() which uses
GFP_KERNEL, it is safe to use GFP_KERNEL from kcalloc() which is
called by selinux_parse_opts_str().

Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 07d9a380

security/selinux/hooks.c

+3 −2
Original line number Diff line number Diff line
@@ -1100,11 +1100,12 @@ static int selinux_parse_opts_str(char *options, 
	}



	rc = -ENOMEM;

	opts->mnt_opts = kcalloc(NUM_SEL_MNT_OPTS, sizeof(char *), GFP_ATOMIC);

	opts->mnt_opts = kcalloc(NUM_SEL_MNT_OPTS, sizeof(char *), GFP_KERNEL);

	if (!opts->mnt_opts)

		goto out_err;



	opts->mnt_opts_flags = kcalloc(NUM_SEL_MNT_OPTS, sizeof(int), GFP_ATOMIC);

	opts->mnt_opts_flags = kcalloc(NUM_SEL_MNT_OPTS, sizeof(int),

				       GFP_KERNEL);

	if (!opts->mnt_opts_flags) {

		kfree(opts->mnt_opts);

		goto out_err;