[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: 652cfeb43d6b9aba5c7c4902bed7a7340df131fb
WARNING: Author mismatch between patch and upstream commit:
Backport author: <jianqi.ren.cn@xxxxxxxxxxxxx>
Commit author: Konstantin Komarov <almaz.alexandrovich@xxxxxxxxxxxxxxxxxxxx>
Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.6.y | Present (different SHA1: 8c77398c7261)
6.1.y | Present (different SHA1: be684526fad4)
Note: The patch differs from the upstream commit:
---
1: 652cfeb43d6b9 ! 1: 77aacf84111d3 fs/ntfs3: Fixed overflow check in mi_enum_attr()
@@ Metadata
## Commit message ##
fs/ntfs3: Fixed overflow check in mi_enum_attr()
+ [ Upstream commit 652cfeb43d6b9aba5c7c4902bed7a7340df131fb ]
+
Reported-by: Robert Morris <rtm@xxxxxxxxxxxxx>
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@xxxxxxxxxxxxxxxxxxxx>
+ Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
+ Signed-off-by: Jianqi.ren.cn@xxxxxxxxxxxxx <jianqi.ren.cn@xxxxxxxxxxxxx>
## fs/ntfs3/record.c ##
@@ fs/ntfs3/record.c: struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struct ATTRIB *attr)
@@ fs/ntfs3/record.c: struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struct ATTR
+ if (le32_to_cpu(attr->res.data_size) > asize - t16)
return NULL;
- t32 = sizeof(short) * attr->name_len;
+ if (attr->name_len &&
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.1.y | Success | Success |
