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

Commit 11eab4ec authored by Tetsuo Handa's avatar Tetsuo Handa Committed by Greg Kroah-Hartman
Browse files

smackfs: use __GFP_NOFAIL for smk_cipso_doi() 

[ Upstream commit f91488ee15bd3cac467e2d6a361fc2d34d1052ae ]

syzbot is reporting kernel panic at smk_cipso_doi() due to memory
allocation fault injection [1]. The reason for need to use panic() was
not explained. But since no fix was proposed for 18 months, for now
let's use __GFP_NOFAIL for utilizing syzbot resource on other bugs.

Link: https://syzkaller.appspot.com/bug?extid=89731ccb6fec15ce1c22

 [1]
Reported-by: default avatarsyzbot <syzbot+89731ccb6fec15ce1c22@syzkaller.appspotmail.com>
Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarCasey Schaufler <casey@schaufler-ca.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 525165eb

security/smack/smackfs.c

+1 −3
Original line number Diff line number Diff line
@@ -721,9 +721,7 @@ static void smk_cipso_doi(void) 
		printk(KERN_WARNING "%s:%d remove rc = %d\n",

		       __func__, __LINE__, rc);



	doip = kmalloc(sizeof(struct cipso_v4_doi), GFP_KERNEL);

	if (doip == NULL)

		panic("smack:  Failed to initialize cipso DOI.\n");

	doip = kmalloc(sizeof(struct cipso_v4_doi), GFP_KERNEL | __GFP_NOFAIL);

	doip->map.std = NULL;

	doip->doi = smk_cipso_doi_value;

	doip->type = CIPSO_V4_MAP_PASS;