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 73A0DC07E99 for ; Sat, 10 Jul 2021 02:42:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 61ED3613BE for ; Sat, 10 Jul 2021 02:42:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235639AbhGJCpd (ORCPT ); Fri, 9 Jul 2021 22:45:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:33904 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235407AbhGJCns (ORCPT ); Fri, 9 Jul 2021 22:43:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E79D06141D; Sat, 10 Jul 2021 02:39:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625884785; bh=J63qNQ5wbp4Y3iHsK/XG9gvi5r6sP9RqpPWd3wMQybE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gL/thfnZQD+6RSyz9JYzoFF7lNmhlykbyUEmUm7FsyHumJAY12aLSoQxzUAsmyw4t 2NtqjBT13Y8thFajRcOVCxR9lnWPuOXk7mAnaZE7WChQ23zcCPHcDWJ/XZsfkdV+hP B0pUvM82JOgqi7gOLtVVGolxw69Exnzlo/xO8Rd8DeVC+zdcY7UntBCu1nwuMWPLBv mxJOd8ugz/IfFf0h2LfqIjw1g32yQRLY8yTk/K32XfFOPT/2YKDZBkkFDmj/WBmrY1 aOTgdXrm3ZYLYS5TazcWf9tjNP+TBZwrYAteo03+IBWroQWUyxNZ4CKQ1AFt6GqE8v LRMbNddFu2Wxw== 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 4.4 22/23] jfs: fix GPF in diFree Date: Fri, 9 Jul 2021 22:39:11 -0400 Message-Id: <20210710023912.3172972-22-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210710023912.3172972-1-sashal@kernel.org> References: <20210710023912.3172972-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 41aa3ca6a6a4..b318732a8562 100644 --- a/fs/jfs/inode.c +++ b/fs/jfs/inode.c @@ -160,7 +160,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