Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp3757460pxv; Mon, 19 Jul 2021 08:05:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzLFO1a9/rLZFRHPma4MIs3hAK/1Mh+cVsVWFJzmCpYH5ID0x6dAE2/WGGhB4sXGgvUbk9R X-Received: by 2002:a5e:9306:: with SMTP id k6mr19939643iom.157.1626707099842; Mon, 19 Jul 2021 08:04:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626707099; cv=none; d=google.com; s=arc-20160816; b=K6bYbYVgGB0KSdSTbgcx8RsXTLsinoezU9x+Cl1AWZ5f4RMxOjxVGmZOsI8sFcl5v6 FXAEaTmxeofb97itPtikgdy8aRgINQ1ES4VS/TVk3zGLkAnNgNnNMWRcGBbJgqf9WjVD m05SMT/5RiYBTrW977MCOgq1zKLnHLNevoF5r+dyU95EiJq9qsCQOqkuVEC0/ycEROz2 t4H7+pz0lFnZ4AGYtjtcb6k1mYzKGqPs5oFeHEIoGOp7qD064TG5mAmdP9Wr/3qHlEct bK355ue3U6gLDb4unIR6XbrLkrBuaNoxPJ4Xf/vP6rrWLH8Pm7P+0ZmWWaGg0Q8d1bBq E72g== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=wZXmfhiyxbGkWhMs7Zi2UzQzbtIbr/yKl9iLnhCEZ5o=; b=HPPmTQmb0bOiZ/wiTsZ/ZtX9ZyROXOz8cm/CFGOKzeCyTb7iwIbbwDbb/ngFFh2GM+ 9dnsW5CeoOuL7zQWQH+fXX0yt/KqzasIRhNWuxFpGTADjzPDLqbZtPmKapUHugudEYH4 sllzdTTmLbU9zULU2ED1efADkFtDhyfS9UEaWzhIZmSHZ6F9QweZz0qAL7HkxHiJo6a+ sCb2z3KuQhiAUzEd+tsRTAJPxmeUFIeXun2m1plkUt/mutD0MejuHOqIx0mDwicSaPuh /QFipg7WIb5sFvY4fxrB88pDoGJVntq8jvRL+UG1qzsvtTn5NuHZubC1D+BwmtolslPd pztA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VqduJJrc; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v14si19618090ilj.0.2021.07.19.08.04.23; Mon, 19 Jul 2021 08:04:59 -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=@linuxfoundation.org header.s=korg header.b=VqduJJrc; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243253AbhGSOXN (ORCPT + 99 others); Mon, 19 Jul 2021 10:23:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:56900 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242369AbhGSOU6 (ORCPT ); Mon, 19 Jul 2021 10:20:58 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 34E706113E; Mon, 19 Jul 2021 15:01:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626706892; bh=nJ1grWDtmDKfyzxuAG3JLQEzaYyWCK/Z7JuC2PlMmrU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VqduJJrcuk+j6gA+y1iyKKrSdk3Ko9PicSUqmGSpahSPazS9qrqB+3MJ/vc2+jE/r lC4jEoHX+JNxt/ukuX/GjlTV59RFCgCcsiD1fhI/E3su6UQEp3AEw3A6rEMSnL5LcE b3rQEak7FoEbMQiu04gsnDfy+haxAxyLUKz/nIdU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pavel Skripkin , Dave Kleikamp , syzbot+0a89a7b56db04c21a656@syzkaller.appspotmail.com Subject: [PATCH 4.4 140/188] jfs: fix GPF in diFree Date: Mon, 19 Jul 2021 16:52:04 +0200 Message-Id: <20210719144941.074965191@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144913.076563739@linuxfoundation.org> References: <20210719144913.076563739@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pavel Skripkin commit 9d574f985fe33efd6911f4d752de6f485a1ea732 upstream. 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: Greg Kroah-Hartman --- fs/jfs/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- 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.