* [PATCH] fs/ntfs3: Don't clear upper bits accidentally in log_replay()
@ 2022-05-09 9:03 Dan Carpenter
2022-05-19 0:55 ` Namjae Jeon
2022-06-10 16:21 ` Konstantin Komarov
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2022-05-09 9:03 UTC (permalink / raw)
To: Konstantin Komarov; +Cc: ntfs3, linux-kernel, linux-fsdevel, kernel-janitors
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 <dan.carpenter@oracle.com>
---
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(-)
diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c
index 915f42cf07bc..0da339fda2f4 100644
--- a/fs/ntfs3/fslog.c
+++ b/fs/ntfs3/fslog.c
@@ -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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] fs/ntfs3: Don't clear upper bits accidentally in log_replay()
2022-05-09 9:03 [PATCH] fs/ntfs3: Don't clear upper bits accidentally in log_replay() Dan Carpenter
@ 2022-05-19 0:55 ` Namjae Jeon
2022-06-10 16:21 ` Konstantin Komarov
1 sibling, 0 replies; 3+ messages in thread
From: Namjae Jeon @ 2022-05-19 0:55 UTC (permalink / raw)
To: Dan Carpenter
Cc: Konstantin Komarov, ntfs3, linux-kernel, linux-fsdevel,
kernel-janitors, Kari Argillander, Kari Argillander
2022-05-09 18:03 GMT+09:00, Dan Carpenter <dan.carpenter@oracle.com>:
> 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 <dan.carpenter@oracle.com>
Reviewed-by: Namjae Jeon <linkinjeon@kernel.org>
> ---
> 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(-)
>
> diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c
> index 915f42cf07bc..0da339fda2f4 100644
> --- a/fs/ntfs3/fslog.c
> +++ b/fs/ntfs3/fslog.c
> @@ -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
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] fs/ntfs3: Don't clear upper bits accidentally in log_replay()
2022-05-09 9:03 [PATCH] fs/ntfs3: Don't clear upper bits accidentally in log_replay() Dan Carpenter
2022-05-19 0:55 ` Namjae Jeon
@ 2022-06-10 16:21 ` Konstantin Komarov
1 sibling, 0 replies; 3+ messages in thread
From: Konstantin Komarov @ 2022-06-10 16:21 UTC (permalink / raw)
To: Dan Carpenter; +Cc: ntfs3, linux-kernel, linux-fsdevel, kernel-janitors
On 5/9/22 12:03, Dan Carpenter wrote:
> 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 <dan.carpenter@oracle.com>
> ---
> 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(-)
>
> diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c
> index 915f42cf07bc..0da339fda2f4 100644
> --- a/fs/ntfs3/fslog.c
> +++ b/fs/ntfs3/fslog.c
> @@ -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!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-06-10 16:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-09 9:03 [PATCH] fs/ntfs3: Don't clear upper bits accidentally in log_replay() Dan Carpenter
2022-05-19 0:55 ` Namjae Jeon
2022-06-10 16:21 ` Konstantin Komarov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).