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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 349A8C77B7F for ; Sat, 20 May 2023 18:22:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231967AbjETSWU (ORCPT ); Sat, 20 May 2023 14:22:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231714AbjETSWB (ORCPT ); Sat, 20 May 2023 14:22:01 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A85ED10F9; Sat, 20 May 2023 11:21:38 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9452A60C03; Sat, 20 May 2023 18:21:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4107AC4339B; Sat, 20 May 2023 18:21:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684606881; bh=cUruHpp5csKVaRsO8925IjftPTB8zY3Vv0Hmu8lUWVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uVbFs3gBoHbd9JB56mKNctb7H6qLe45kfmwzqtcDeqZApUsmhITuFKkkKLiU/KQzV MGtDDfIJw6AYivb0ahAstjAGaPv9y6eavS9hoKwMzOOaACtyUAnB/ud6LBybXUJFXM ZAjLEvDhcQtn5fgsWC26yslDHRUtVBgr5WlvpCZwJBs88Oa2isb2QK1NjVnhA0RoR7 rqgOGd36Yjpze7OWp617DZswlqLluccIzcjImAqLo+7i0/FyWZqfE3sz0KbdtsxNl7 tHsGt/77fAFd8Xlsh5AD8XU5nwgz05VJtEt7MpK0uuJ8t2UnVlH2ygr8/ifV6TGMNb WsgNmxJgBIz3A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bob Peterson , Yang Lan , Andreas Gruenbacher , Sasha Levin , cluster-devel@redhat.com Subject: [PATCH AUTOSEL 6.1 08/14] gfs2: Don't deref jdesc in evict Date: Sat, 20 May 2023 14:20:36 -0400 Message-Id: <20230520182044.836702-8-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230520182044.836702-1-sashal@kernel.org> References: <20230520182044.836702-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: stable@vger.kernel.org From: Bob Peterson [ Upstream commit 504a10d9e46bc37b23d0a1ae2f28973c8516e636 ] On corrupt gfs2 file systems the evict code can try to reference the journal descriptor structure, jdesc, after it has been freed and set to NULL. The sequence of events is: init_journal() ... fail_jindex: gfs2_jindex_free(sdp); <------frees journals, sets jdesc = NULL if (gfs2_holder_initialized(&ji_gh)) gfs2_glock_dq_uninit(&ji_gh); fail: iput(sdp->sd_jindex); <--references jdesc in evict_linked_inode evict() gfs2_evict_inode() evict_linked_inode() ret = gfs2_trans_begin(sdp, 0, sdp->sd_jdesc->jd_blocks); <------references the now freed/zeroed sd_jdesc pointer. The call to gfs2_trans_begin is done because the truncate_inode_pages call can cause gfs2 events that require a transaction, such as removing journaled data (jdata) blocks from the journal. This patch fixes the problem by adding a check for sdp->sd_jdesc to function gfs2_evict_inode. In theory, this should only happen to corrupt gfs2 file systems, when gfs2 detects the problem, reports it, then tries to evict all the system inodes it has read in up to that point. Reported-by: Yang Lan Signed-off-by: Bob Peterson Signed-off-by: Andreas Gruenbacher Signed-off-by: Sasha Levin --- fs/gfs2/super.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 2015bd05cba10..9d27aa8bd2bc6 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -1380,6 +1380,14 @@ static void gfs2_evict_inode(struct inode *inode) if (inode->i_nlink || sb_rdonly(sb)) goto out; + /* + * In case of an incomplete mount, gfs2_evict_inode() may be called for + * system files without having an active journal to write to. In that + * case, skip the filesystem evict. + */ + if (!sdp->sd_jdesc) + goto out; + gfs2_holder_mark_uninitialized(&gh); ret = evict_should_delete(inode, &gh); if (ret == SHOULD_DEFER_EVICTION) -- 2.39.2