From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0FF835F54E; Tue, 13 Feb 2024 17:28:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707845281; cv=none; b=iOit1CwVsENa+XubTSqN4NPtDHfxKENvkTj3GizIBguPYBnkmt6qduCAFhVjrJMYT7gsrGC2fBIMLcPd5Ofh2CebOlo97gPlIkeIzRxn0TaMSDMOEaGrn/9MxFcweR2D62JvzWilA1jfrsFPcW182yDC0PgrVeqgPvBaBeI0zfU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707845281; c=relaxed/simple; bh=UN/1UDSI+kv8k7SSD3JDFtdV0K50JFMi05WBE3TL3tU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BIjrkv9tNcDENyTVgaLbmQPgdTuZ5Vk5+ji1kRuZSRadHFq6IALgIep6EeV5wd135QNbv8az+XVSJ+LZpKL/hhqzHGvluc5Fz91rsPRAcWX5AgbVrYfuu5BKrLNbduAefRNhBEazT5L4ULV0ykpvSMfrIuPRXNdf/CdTv0qWLDY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=x31UvlsL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="x31UvlsL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2BFE8C433C7; Tue, 13 Feb 2024 17:27:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1707845280; bh=UN/1UDSI+kv8k7SSD3JDFtdV0K50JFMi05WBE3TL3tU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=x31UvlsL4nTvCBd5ArxJh0jZ1UnLGY35sp+kd+bZTr3Xqz+tS9NpxyYQGWT44lmgN JrEsVa6IzRU+/6SBSKmc4Hcuv0BEoYr9LeuzsrU37R8adORc7SO5LHBS81QYu2b4Kw 0ZCQ5tc7W7dnK0jYjXNzVWxNc/Qz2qUmZ4fZdwv4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Darrick J. Wong" , Christoph Hellwig , Chandan Babu R , Catherine Hoang , Sasha Levin Subject: [PATCH 6.6 035/121] xfs: dquot recovery does not validate the recovered dquot Date: Tue, 13 Feb 2024 18:20:44 +0100 Message-ID: <20240213171854.016580894@linuxfoundation.org> X-Mailer: git-send-email 2.43.1 In-Reply-To: <20240213171852.948844634@linuxfoundation.org> References: <20240213171852.948844634@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Darrick J. Wong commit 9c235dfc3d3f901fe22acb20f2ab37ff39f2ce02 upstream. When we're recovering ondisk quota records from the log, we need to validate the recovered buffer contents before writing them to disk. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Chandan Babu R Signed-off-by: Catherine Hoang Acked-by: Chandan Babu R Signed-off-by: Sasha Levin --- fs/xfs/xfs_dquot_item_recover.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/fs/xfs/xfs_dquot_item_recover.c b/fs/xfs/xfs_dquot_item_recover.c index db2cb5e4197b..2c2720ce6923 100644 --- a/fs/xfs/xfs_dquot_item_recover.c +++ b/fs/xfs/xfs_dquot_item_recover.c @@ -19,6 +19,7 @@ #include "xfs_log.h" #include "xfs_log_priv.h" #include "xfs_log_recover.h" +#include "xfs_error.h" STATIC void xlog_recover_dquot_ra_pass2( @@ -152,6 +153,19 @@ xlog_recover_dquot_commit_pass2( XFS_DQUOT_CRC_OFF); } + /* Validate the recovered dquot. */ + fa = xfs_dqblk_verify(log->l_mp, dqb, dq_f->qlf_id); + if (fa) { + XFS_CORRUPTION_ERROR("Bad dquot after recovery", + XFS_ERRLEVEL_LOW, mp, dqb, + sizeof(struct xfs_dqblk)); + xfs_alert(mp, + "Metadata corruption detected at %pS, dquot 0x%x", + fa, dq_f->qlf_id); + error = -EFSCORRUPTED; + goto out_release; + } + ASSERT(dq_f->qlf_size == 2); ASSERT(bp->b_mount == mp); bp->b_flags |= _XBF_LOGRECOVERY; -- 2.43.0