Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp1146836pxv; Fri, 9 Jul 2021 19:30:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwAt/l9lt9n5c0f4/203B6KpsLlhH4/Shq8s8w7fGFAP/qVdKcS+9DkLDIdslmLIsZZHtYG X-Received: by 2002:aa7:c857:: with SMTP id g23mr49179460edt.100.1625884217766; Fri, 09 Jul 2021 19:30:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625884217; cv=none; d=google.com; s=arc-20160816; b=YLPQUkdGUL7XTLfORgQQfMyEq527DgU+T66i0WL/nZjGlSZjNBv8dEMB4qmWaOlloE lR4NfYcQ8UClRa5qYtEj2mtMWeZEWTSHNLkiDqnxIOdSFWpWwKYp8/H00kLszst8BdQa 79dPzDPcWnlm/Air5VynqYOEI4qDMPtUnC6Nx6zEyrEVSvohjyPshloeliC8soznVdPd FhJVOJLKTlBhfWGoRAHfIY3GDmjmOd73b9mIQXea1Sp+2uo97jy6muQd87eswUB97kYT dSKo56y8+kkZw9tSNkJr+pN7tGucAnZFfgHyAIR24GhDIj4492k1sxFy3URKFr9G904m CFoQ== 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=9mazf+iQElWVJ384MWw05wyxk5nif7J/wQ2KF99X0hE=; b=mHo1/qJGLUWGonWvKTqnX3GZS0MaKtyn4OTDoeVVgDg+WZon1laVP7WUbMm/OGJdSn JRI/rNI7OYTvxgtBTnYAPcNk4SEu/uCDrJ0Mmg7scKJxxO5AhEfOvgv5Dh8+RVGQZ3FG NmqWmRyMJfHrwSiHM9gWSWTB6iRPZH5GXYUoOsjmaPZFFtWb8/eE1esMDpa4a8J9U+c8 ECqGQQhq+PwNJSHylzvDHMrWRhhUGkj4GB3m9Z6+mjjzn6603w6g/PbBPNPDXsTy/orH Srjb6EbHupoedg9TnTU4EuPNBFwbJ1vOZbhddUTzOAnbnyZf0U34iPdGfMSp2GCq+z94 AIhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="K7Evs/+p"; 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 u9si10607413edr.171.2021.07.09.19.29.55; Fri, 09 Jul 2021 19:30:17 -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="K7Evs/+p"; 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 S234156AbhGJC3N (ORCPT + 99 others); Fri, 9 Jul 2021 22:29:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:42616 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233733AbhGJC1H (ORCPT ); Fri, 9 Jul 2021 22:27:07 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E1F11613DC; Sat, 10 Jul 2021 02:24:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625883854; bh=mwAXzCQTCpeyzRqdPBQBVEoSYtdysFiIiiFsm4R9IlM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K7Evs/+pbglol+0Kf3ocr+//kSrwXvtjNN0YgOYhWzeIhXeztDLXr/ryaRJuYjyMt +/VpXeh+1poic+tIQTg/z5ymESI3eVPuANfv6kxbkRa8UM3lVZyr7g0OwXlqI6VlZE 9W2UVxYOTkiFQZGwaT3PhEhBMkgs1eYcDhpRm/vIAZpSPfrppVT7fm+UamwPrxLOw3 63m6DzO5exRGx6+KE2UV9rvUSH7iDpve7kif6mIHcnF0g5BEEYmjegFilm3ZxgPKRU aN0UI+dNZjj2xX7tV1U3pzD3fu2KqNQjOWDbzb47yq/GucvmUv7HWRvaein+VocUnK 4KIWNMu12yLEw== 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.12 097/104] jfs: fix GPF in diFree Date: Fri, 9 Jul 2021 22:21:49 -0400 Message-Id: <20210710022156.3168825-97-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210710022156.3168825-1-sashal@kernel.org> References: <20210710022156.3168825-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 6f65bfa9f18d..b0eb9c85eea0 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