[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: 7063b80268e2593e58bee8a8d709c2f3ff93e2f2
WARNING: Author mismatch between patch and upstream commit:
Backport author: guocai.he.cn@xxxxxxxxxxxxx
Commit author: Pei Li <peili.dev@xxxxxxxxx>
Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.6.y | Present (different SHA1: f650148b4394)
6.1.y | Present (different SHA1: bd04a149e3a2)
5.15.y | Not found
Note: The patch differs from the upstream commit:
---
1: 7063b80268e25 ! 1: 3d07377d81082 jfs: Fix shift-out-of-bounds in dbDiscardAG
@@ Metadata
## Commit message ##
jfs: Fix shift-out-of-bounds in dbDiscardAG
+ [ Upstream commit 7063b80268e2593e58bee8a8d709c2f3ff93e2f2 ]
+
When searching for the next smaller log2 block, BLKSTOL2() returned 0,
causing shift exponent -1 to be negative.
@@ Commit message
Closes: https://syzkaller.appspot.com/bug?extid=61be3359d2ee3467e7e4
Signed-off-by: Pei Li <peili.dev@xxxxxxxxx>
Signed-off-by: Dave Kleikamp <dave.kleikamp@xxxxxxxxxx>
+ Signed-off-by: Guocai He <guocai.he.cn@xxxxxxxxxxxxx>
## fs/jfs/jfs_dmap.c ##
@@ fs/jfs/jfs_dmap.c: s64 dbDiscardAG(struct inode *ip, int agno, s64 minlen)
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.15.y | Success | Success |
