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 X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40A41C07E99 for ; Sat, 10 Jul 2021 02:35:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 214E2613E1 for ; Sat, 10 Jul 2021 02:35:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234820AbhGJCho (ORCPT ); Fri, 9 Jul 2021 22:37:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:53518 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235633AbhGJCe5 (ORCPT ); Fri, 9 Jul 2021 22:34:57 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A3C0E613F3; Sat, 10 Jul 2021 02:31:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625884317; bh=RHS9+6stfTXurVpnuRMEjx5knZzVF48yDPW7wzsu9Ko=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o2Np/PGh/tai4+e2IGcJ+vAjmvEwI+Dzu6TrK1RVaNFr+lrpPbz0qSOAOzoc4Ks33 bxIhoN59kqHOZosmZweVzXz4oT7jAUX7BtcIxFanNdL3tTYbsAPxp6iQ+HBsOy8dR7 h/cFmkBAlVY2Onqc7UM2NsFEKNg7f88qtLM3sTyXA2g+gQliXV6XKz/qo+alqsiBEw gNHJ/JQf6iVZsKsOkWsm3VwroRptXjEQ+7XuGAuXgE0URzJk4pw53L3h1eMU6yWOaI fFT2lF5hSAZaSqgOngXFeZ81SO8w6CBrHH09Wr7KOVRJk8ZidQXJ7mNMZiT2bN1ODh dUktMiubwwAWA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pavel Skripkin , syzbot+0a89a7b56db04c21a656@syzkaller.appspotmail.com, Dave Kleikamp , Sasha Levin , jfs-discussion@lists.sourceforge.net Subject: [PATCH AUTOSEL 5.4 59/63] jfs: fix GPF in diFree Date: Fri, 9 Jul 2021 22:27:05 -0400 Message-Id: <20210710022709.3170675-59-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210710022709.3170675-1-sashal@kernel.org> References: <20210710022709.3170675-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: Pavel Skripkin [ Upstream commit 9d574f985fe33efd6911f4d752de6f485a1ea732 ] Avoid passing inode with JFS_SBI(inode->i_sb)->ipimap == NULL to diFree()[1]. GFP will appear: struct inode *ipimap = JFS_SBI(ip->i_sb)->ipimap; struct inomap *imap = JFS_IP(ipimap)->i_imap; JFS_IP() will return invalid pointer when ipimap == NULL Call Trace: diFree+0x13d/0x2dc0 fs/jfs/jfs_imap.c:853 [1] jfs_evict_inode+0x2c9/0x370 fs/jfs/inode.c:154 evict+0x2ed/0x750 fs/inode.c:578 iput_final fs/inode.c:1654 [inline] iput.part.0+0x3fe/0x820 fs/inode.c:1680 iput+0x58/0x70 fs/inode.c:1670 Reported-and-tested-by: syzbot+0a89a7b56db04c21a656@syzkaller.appspotmail.com Signed-off-by: Pavel Skripkin Signed-off-by: Dave Kleikamp Signed-off-by: Sasha Levin --- fs/jfs/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c index 9486afcdac76..d862cfc3d3a8 100644 --- a/fs/jfs/inode.c +++ b/fs/jfs/inode.c @@ -151,7 +151,8 @@ void jfs_evict_inode(struct inode *inode) if (test_cflag(COMMIT_Freewmap, inode)) jfs_free_zero_link(inode); - diFree(inode); + if (JFS_SBI(inode->i_sb)->ipimap) + diFree(inode); /* * Free the inode from the quota allocation. -- 2.30.2