[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: 031d6f608290c847ba6378322d0986d08d1a645a
WARNING: Author mismatch between patch and upstream commit:
Backport author: Suraj Jitindar Singh<surajjs@xxxxxxxxxx>
Commit author: Konstantin Komarov<almaz.alexandrovich@xxxxxxxxxxxxxxxxxxxx>
Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.6.y | Present (different SHA1: 550ef40fa636)
6.1.y | Present (different SHA1: d1ac7e262030)
5.15.y | Not found
Note: The patch differs from the upstream commit:
---
1: 031d6f608290c ! 1: 4e423d945bbe7 fs/ntfs3: Additional check in ntfs_file_release
@@ Metadata
## Commit message ##
fs/ntfs3: Additional check in ntfs_file_release
+ commit 031d6f608290c847ba6378322d0986d08d1a645a upstream.
+
Reported-by: syzbot+8c652f14a0fde76ff11d@xxxxxxxxxxxxxxxxxxxxxxxxx
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@xxxxxxxxxxxxxxxxxxxx>
+ Signed-off-by: Bin Lan <bin.lan.cn@xxxxxxxxxxxxx>
+ Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
+ Signed-off-by: Suraj Jitindar Singh <surajjs@xxxxxxxxxx>
## fs/ntfs3/file.c ##
@@ fs/ntfs3/file.c: static int ntfs_file_release(struct inode *inode, struct file *file)
+ int err = 0;
+
/* If we are last writer on the inode, drop the block reservation. */
- if (sbi->options->prealloc &&
- ((file->f_mode & FMODE_WRITE) &&
-- atomic_read(&inode->i_writecount) == 1)) {
+- if (sbi->options->prealloc && ((file->f_mode & FMODE_WRITE) &&
+- atomic_read(&inode->i_writecount) == 1)) {
++ if (sbi->options->prealloc &&
++ ((file->f_mode & FMODE_WRITE) &&
+ atomic_read(&inode->i_writecount) == 1)
+ /*
+ * The only file when inode->i_fop = &ntfs_file_operations and
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.15.y | Success | Success |
