Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp1148532pxv; Fri, 9 Jul 2021 19:33:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLemIXMN4NjfBgfnOHrdCAW0oq9K3eFbZUK+/oL11Z4UrnblLppMuj5zeUuaCtbOa8fWDs X-Received: by 2002:a17:906:d541:: with SMTP id cr1mr38137716ejc.81.1625884425985; Fri, 09 Jul 2021 19:33:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625884425; cv=none; d=google.com; s=arc-20160816; b=yppw6IFi1eJx7QkS0SxrVFojJhnJSyfforbF63h0fRK456FntpZisHnQIESRlOE2Wc /mt06EYcC3LPNaBzkKBcvK6255cy6/aRbnRUbkfFwy6zxWNRSoh6LoTmuYTnYFCUjhFi aHDpe9JV7YVPa7qIrHbsozAf2u2ZZqpWnU/2Ewwpm/hAu2AyrPu08p9yqg0UqtPn9Nhl EcYou+VQ2BOEHi46xEJplu1aBu5zU3yKKioxIM+59Cv/PDNseMq/SGuoHqtPImaPjJcG 7BX2W34M1kXoAT+aiQOboZ+gHzhU65xYkvkIk72c9PrR/hmNbeM/QP0b73lmQq+fv2Yu Y6Yw== 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=FdqSBNhkLKsDLbLCDuhDv/Be5xVBxaXKJA5zvGh0SE57xoRuVOTr/eslidq9V1Z6+E RAxE6zbT1ZL4FY/Q7aUngK0U6JHyiAg9DmJzzffwgbvuV+QeK5sVsoX+EbuyXL5lTETU 7zZQNlVWzUQOthPofGk1aDOPc5LmnPtKMQ5Vt1QqwkuN/EwwlGrQRNtWFU5h92anCcDJ v8Txtyc783yCeASrqPwWq0Lh3z8Ym/oliguuVzgwHMHNlWQR1XI/tfb8arRU9CvambuH B7iHoE3bhhOrxiwaZO9AXSUIUwcDkusdBJKImTIpqMzydnGhWBQVjS0l4Dhi4cWSKNCi NXlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=gX8nVLYD; 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 w9si9731677edx.213.2021.07.09.19.33.23; Fri, 09 Jul 2021 19:33:45 -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=gX8nVLYD; 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 S235039AbhGJCeb (ORCPT + 99 others); Fri, 9 Jul 2021 22:34:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:41906 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234653AbhGJC3j (ORCPT ); Fri, 9 Jul 2021 22:29:39 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8315A60BD3; Sat, 10 Jul 2021 02:26:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625884015; bh=mwAXzCQTCpeyzRqdPBQBVEoSYtdysFiIiiFsm4R9IlM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gX8nVLYDusUOkI+laedW/dd1q2li9XoDtkIlGKIuUf41hMz6ICniOQEyCFJWFvh5W n2CF9cW9M9NA9A2c8QxTkGvcTTeqDAs9/NSr50Iom6HRY79X9cabh44qULYIf88CJx wcZz84Eass1fYr7cXb7vUQ0ZkDnlgegnH2h1xeQKMWnRN/l/SK2kGywL64BG+wyTyX hOgjb0oa4BoBUFiyGuOXxaP1vhpTiBCm76c2CUeVTZvr4nwTvu7hIIXTP9FWbdqSBj RoMmZLxCi7VGDug1FsthdDcqFkH3WLO3U4j2eXFR07/1ZlhgvpwdhDGkyOfhSRpIE9 RuWV1uDm5m4Sg== 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.10 86/93] jfs: fix GPF in diFree Date: Fri, 9 Jul 2021 22:24:20 -0400 Message-Id: <20210710022428.3169839-86-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210710022428.3169839-1-sashal@kernel.org> References: <20210710022428.3169839-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