fs/ntfs3: Don't clear upper bits accidentally in log_replay()
Subsystems (3)
PATCH 1/1 fs/ntfs3: Don't clear upper bits accidentally in log_replay()
The "vcn" variable is a 64 bit. The "log->clst_per_page" variable is a u32. This means that the mask accidentally clears out the high 32 bits when it was only supposed to clear some low bits. Fix this by adding a cast to u64.
---
Why am I getting new Smatch warnings in old ntfs3 code? It is a mystery.
fs/ntfs3/fslog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ntfs3/fslog.c +1 -1
@@ -5057,7 +5057,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized) goto add_allocated_vcns; vcn =le64_to_cpu (lrh->target_vcn); - vcn &= ~(log->clst_per_page -1 ); + vcn &= ~(u64)(log->clst_per_page -1 ); add_allocated_vcns: for (i = 0, vcn = le64_to_cpu(lrh->target_vcn),
Signature · 1 line
2.35.1
2022-05-09 18:03 GMT+09:00, Dan Carpenter <[email protected]>:
Quoted 7 lines
The "vcn" variable is a 64 bit. The "
log->clst_per_page" variable is a u32. This means that the mask accidentally clears out the high 32 bits when it was only supposed to clear some low bits. Fix this by adding a cast to u64.Fixes b46acd6a6a62 ("fs/ntfs3: Add NTFS journal")Signed-off-by Dan Carpenter <[email protected]>
Quoted 25 lines
---
Why am I getting new Smatch warnings in old ntfs3 code? It is a mystery.fs/ntfs3/fslog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/ntfs3/fslog.c +1
-1@@ -5057,7 +5057,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized) goto add_allocated_vcns; vcn =le64_to_cpu (lrh->target_vcn); - vcn &= ~(log->clst_per_page -1 ); + vcn &= ~(u64)(log->clst_per_page -1 ); add_allocated_vcns:for (i = 0, vcn =
le64_to_cpu(lrh->target_vcn),
--
2.35.1
Konstantin Komarov
maintainerQuoted 18 lines · Dan Carpenter
The "vcn" variable is a 64 bit. The "
log->clst_per_page" variable is a u32. This means that the mask accidentally clears out the high 32 bits when it was only supposed to clear some low bits. Fix this by adding a cast to u64.Fixes b46acd6a6a62 ("fs/ntfs3: Add NTFS journal")Signed-off-by Dan Carpenter <[email protected]>---
Why am I getting new Smatch warnings in old ntfs3 code? It is a mystery.fs/ntfs3/fslog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/ntfs3/fslog.c +0
-0
fs/ntfs3/fslog.c int log_replay(struct ntfs_inode *ni, bool *initialized) · line 5063
Quoted 8 lines
fs/ntfs3/fslog.c +1
-1@@ -5057,7 +5057,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized) goto add_allocated_vcns; vcn =le64_to_cpu (lrh->target_vcn); - vcn &= ~(log->clst_per_page -1 ); + vcn &= ~(u64)(log->clst_per_page -1 ); add_allocated_vcns: for (i = 0, vcn = le64_to_cpu(lrh->target_vcn),
Thanks for patch, applied!