Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp1151920pxv; Fri, 9 Jul 2021 19:40:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmEB1dctoPmxY5kEp5ytqwgmwo3FI0Oi7kRedT4C7IRB4m2pmB10Z9M1PN8Aq6DCzDrf7g X-Received: by 2002:a6b:794b:: with SMTP id j11mr30381983iop.129.1625884855161; Fri, 09 Jul 2021 19:40:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625884855; cv=none; d=google.com; s=arc-20160816; b=Lls4vswp8nqARJWMjwajkM9zdkfteRxidrJsP98ayixKJsWOEXqVO0wy3J4w2Lm7Cv 0yyG13/zdQXrzK1voD/H+Lfv54eddKHO6zpehkFu2D6ipw49g5LyfKdhsu6r5ENNm7cE QoXNbNNLRQC7cUh0ruYahFurT0CaZlH4JWXOVEXdNHSUocyYsbOm5YlADBj0k0Xx3bYO vtd1gdILwYjOb0g962oBir1LFyI7v5J3Ggp7gEwY5s4uJUY32H5INFcWAY7FvU48SJ4N vaw0WA8s0aOzEWAVbYMoY2SU78/X9oKft7xPDNi3+9u86B+PLOb4eLgu/cmqFvxzjGcb xxRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=blJw2MwM7n59qUiv1xlhljJdieBsMurKGslTNv4JIPs=; b=vS7+U+jecCY66XfgpEMij7TRDfY5mRUKTyyZi8dk68VNqQWUkKmn4x0RjUn7/SN5r2 YPPj6NTmboA9+xUMYKBzcfZRntME1gAwhIYdMP0hbi+eSBZ5P32n6RoAAfPJZxNao1kl loTbKSDzkPd2M4GmaAtW/dbtxOFC8D9kj9AfdmVZ0kVFnO7UtsknwOMTerCHBg/tQUMs wPoM30EQSuKobQ4zxj/6W0VjvYUkgf/P6EldEr4yENS4kx2ncDdZAxTxbX9K71Lu1qkk MEkb7sHQQIssP0384gRoPMMpfomUolhBLsih4DkJ1WI/Y+mT706hfFzT79JwWwg/Omlr YZAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nnPrCb1D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o12si9542652ilu.12.2021.07.09.19.40.42; Fri, 09 Jul 2021 19:40:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nnPrCb1D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233988AbhGJCl4 (ORCPT + 99 others); Fri, 9 Jul 2021 22:41:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:58374 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234917AbhGJCjS (ORCPT ); Fri, 9 Jul 2021 22:39:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7BAC0613E8; Sat, 10 Jul 2021 02:35:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625884509; bh=yD6W4/r6M9zDVJ64wHXlrnyWoD3qTyHoWwz14c6ixt4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nnPrCb1Doaxepl9wlkK6hGlgZDzDYHPHSpc2rCSKlMutI65iRc5KEc9OhQaOlmko9 GxYnziQwldvpLrKrbDasJFw4Y3eJZQXLXmuHitBza29XVHPJbmT2ndAnEPWMcgIQd6 BGRYMMMT9r6v0XlWic1uwjPDVJ7ZQ0NbMEP/mpFx8PCndo3ZPAVq4rUcwSSOrITi2n 4FdC2ElmP9MCHQLyxd70kvsEMIo4dUR6RS72OjB6BBe3ujuO/vvlZoL0i0EABYWlgR P5bxklgBr/e947P0Ne4AR3zWoM22Tp0wd2P0AHp6/EVhJAiVaFnIe7IFrCYpOVCfmC hY+uhWfMqCeZw== 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.19 35/39] jfs: fix GPF in diFree Date: Fri, 9 Jul 2021 22:32:00 -0400 Message-Id: <20210710023204.3171428-35-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210710023204.3171428-1-sashal@kernel.org> References: <20210710023204.3171428-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 054cc761b426..87b41edc800d 100644 --- a/fs/jfs/inode.c +++ b/fs/jfs/inode.c @@ -161,7 +161,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