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 6F0EC200B9C for ; Wed, 27 Nov 2024 16:15:03 +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=1732724103; cv=none; b=fsezc2kcBd7nHPuD5XkO2wqF4ngDELxYJUpDq0aDCaGgEqy91YUOs2KtEsX/RlTywcxlBajtl9IZte0+Fcdw3MH/cfpKQJO+XwgfJd7vHq1KYAV4r1FcewBcvKjdh1Aki3UlYeP41gnFtdgwDv6HAY6Vys6WDt60PrhPDcOCMow= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732724103; c=relaxed/simple; bh=H8/iPG4GMsd1+cwQqWCA9SoteRegxnXBpuM7ZP6lHbo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X3W/SWDXGsRRCKeVPKEj3fTy2sVcwXJAPMwgNCGdfizgTLUlbr8nImGOsIhPaEoHubUDN8V29wlo1/xuPTD0G4O/qpuH/KY5VQH77roJzLtmUJKDkMhLiNE1w6mDUtovezV1UDmKUsYmQnPf4amrtyEaCGRnoABuiM0zA9w/itg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QniUYtQw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QniUYtQw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A799CC4CECC; Wed, 27 Nov 2024 16:15:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732724103; bh=H8/iPG4GMsd1+cwQqWCA9SoteRegxnXBpuM7ZP6lHbo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QniUYtQwjY+KmBd/uJuSaWc18Sn5Vs0r0/Uz1ggSYHDlExt9qyAB5MLKg0B1GHKnj 4QMLyZRjaElqXgGcdaVOWAZQNfvbNaRz1+e7cDcVYTauiWwTTzeFHXUkC/Ay8o8+h4 4BiGkjYn6deUthTYoHRZQchA5KFkNXLvla88+7H7iT/dYHicmkt7YqXO0aHYsyFLsU 7y9Jtm8FpK9C8w/mQKIFNZsmDwb5CGg+Oyx1IdI1kAg6fI4N5FvbtmewsRpUVGc+6N a8SEQo3hDwR330YigHfC7TpaSa7pqKZmpxeehafLFoxkaHhcOQ7TDhxl+NMIWyCllQ pMWvO/R0i2TvA== From: Sasha Levin To: stable@vger.kernel.org Cc: Bin Lan , Sasha Levin Subject: Re: [PATCH 6.1] xfs: add bounds checking to xlog_recover_process_data Date: Wed, 27 Nov 2024 11:15:01 -0500 Message-ID: <20241127092348-71078fcecc786710@stable.kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241127130814.1203257-1-bin.lan.cn@windriver.com> References: Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit [ Sasha's backport helper bot ] Hi, The upstream commit SHA1 provided is correct: fb63435b7c7dc112b1ae1baea5486e0a6e27b196 WARNING: Author mismatch between patch and upstream commit: Backport author: Bin Lan Commit author: lei lu Status in newer kernel trees: 6.12.y | Present (exact SHA1) 6.11.y | Present (exact SHA1) 6.6.y | Not found 6.1.y | Not found Note: The patch differs from the upstream commit: --- --- - 2024-11-27 09:15:10.118544781 -0500 +++ /tmp/tmp.yXhwFlxu6p 2024-11-27 09:15:10.108180884 -0500 @@ -1,3 +1,5 @@ +[ Upstream commit fb63435b7c7dc112b1ae1baea5486e0a6e27b196 ] + There is a lack of verification of the space occupied by fixed members of xlog_op_header in the xlog_recover_process_data. @@ -22,15 +24,16 @@ Reviewed-by: Dave Chinner Reviewed-by: Darrick J. Wong Signed-off-by: Chandan Babu R +Signed-off-by: Bin Lan --- fs/xfs/xfs_log_recover.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c -index 4fe627991e865..409b645ce7995 100644 +index affe94356ed1..006a376c34b2 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c -@@ -2489,7 +2489,10 @@ xlog_recover_process_data( +@@ -2439,7 +2439,10 @@ xlog_recover_process_data( ohead = (struct xlog_op_header *)dp; dp += sizeof(*ohead); @@ -42,3 +45,6 @@ /* errors will abort recovery */ error = xlog_recover_process_ophdr(log, rhash, rhead, ohead, +-- +2.34.1 + --- Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.1.y | Success | Success |