fs/ntfs3: Additional check in ntfs_file_release
PATCH 1/1 fs/ntfs3: Additional check in ntfs_file_release
From: Konstantin Komarov <[email protected]>
commit 031d6f608290c847ba6378322d0986d08d1a645a upstream.
--- fs/ntfs3/file.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
fs/ntfs3/file.c +10 -2
@@ -1192,8 +1192,16 @@ 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 ) +/* +* The only file when inode->i_fop = &ntfs_file_operations and +* init_rwsem(&ni->file.run_lock) is not called explicitly is MFT. +* +* Add additional check here. +*/ + && inode->i_ino !=MFT_REC_MFT ) {ni_lock (ni);down_write (&ni->file.run_lock);
Signature · 1 line
2.40.1
Sasha Levin
maintainer[ 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<[email protected]> Commit author: Konstantin Komarov<[email protected]>
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: [email protected]
Signed-off-by: Konstantin Komarov <[email protected]>
+ Signed-off-by: Bin Lan <[email protected]>
+ Signed-off-by: Sasha Levin <[email protected]>
+ Signed-off-by: Suraj Jitindar Singh <[email protected]>
## 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 |