[ 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 <bin.lan.cn@xxxxxxxxxxxxx> Commit author: lei lu <llfamsec@xxxxxxxxx> Status in newer kernel trees: 6.12.y | Present (exact SHA1) 6.11.y | Present (exact SHA1) 6.6.y | Not found Note: The patch differs from the upstream commit: --- --- - 2024-11-27 09:08:44.495159015 -0500 +++ /tmp/tmp.uVpAtajSTd 2024-11-27 09:08:44.489488570 -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 <dchinner@xxxxxxxxxx> Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx> Signed-off-by: Chandan Babu R <chandanbabu@xxxxxxxxxx> +Signed-off-by: Bin Lan <bin.lan.cn@xxxxxxxxxxxxx> --- 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 9f9d3abad2cf..d11de0fa5c5f 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c -@@ -2489,7 +2489,10 @@ xlog_recover_process_data( +@@ -2456,7 +2456,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.6.y | Success | Success |
