Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <01e2f814-1fcf-bc0c-b580-e3879eda85b6@paragon-software.com>
Date:   Fri, 10 Jun 2022 19:21:28 +0300
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.9.0
Subject: Re: [PATCH] fs/ntfs3: Don't clear upper bits accidentally in
 log_replay()
Content-Language: en-US
To:     Dan Carpenter <dan.carpenter@oracle.com>
CC:     <ntfs3@lists.linux.dev>, <linux-kernel@vger.kernel.org>,
        <linux-fsdevel@vger.kernel.org>, <kernel-janitors@vger.kernel.org>
References: <YnjY58EpRzaZP+YC@kili>
From:   Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
In-Reply-To: <YnjY58EpRzaZP+YC@kili>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


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!