From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00076C433EF for ; Tue, 9 Nov 2021 01:29:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB9FA610CB for ; Tue, 9 Nov 2021 01:29:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243454AbhKIBc2 (ORCPT ); Mon, 8 Nov 2021 20:32:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:58406 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243156AbhKIB0y (ORCPT ); Mon, 8 Nov 2021 20:26:54 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3278361B51; Tue, 9 Nov 2021 01:10:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636420208; bh=72ypZuCUMzT6BiLWCUpF5OO0s46E8zScmkNo2fVNvyY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IJfY/Re178Y7OQQ6DfUZVLvNoOyEEBArPP+9rzzE0IkpNOJuX+/Nlbe7K1B7TJLUl iI2+xhmPUm0c/Qm8TTu5tf+InAr+gOchCSAewK7GG274O/M3NikmYFx6OMjrV1jVgh j+8M+oYIT0GCblzt4mpRK6Pdfj9Bq6rtMgwKytEwxPCAJVUVf1GFRThZ6QQcNd51bN cEjhfr2mlpmwsxrrh+TJ3btOY/Ig7GGny9WCrSx+erI8IVlgCDr9SPLnpaEs+ABYn1 dQq+XK9pH0Gs7UAf1HDm9D3fO8hj2UR3dKS3Cag18uaHudBNctNonueRsJtX2ZLk6A K1NpQjm1B1riw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tetsuo Handa , syzbot , Tetsuo Handa , Casey Schaufler , Sasha Levin , jmorris@namei.org, serge@hallyn.com, linux-security-module@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 26/30] smackfs: use __GFP_NOFAIL for smk_cipso_doi() Date: Mon, 8 Nov 2021 20:09:14 -0500 Message-Id: <20211109010918.1192063-26-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211109010918.1192063-1-sashal@kernel.org> References: <20211109010918.1192063-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tetsuo Handa [ 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: syzbot Signed-off-by: Tetsuo Handa Signed-off-by: Casey Schaufler Signed-off-by: Sasha Levin --- security/smack/smackfs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c index 845ed464fb8cd..40c8b2b8a4722 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c @@ -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; -- 2.33.0