linux-kernel - Re: [PATCH v2] smb/client: Fix logically dead code

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAH2r5muZn5OEUsXJ-LujJmnHmVMq+TuH89uxkbfXwVjLiCD+TQ@mail.gmail.com>
Date: Mon, 7 Oct 2024 11:34:52 -0500
From: Steve French <smfrench@...il.com>
To: Advait Dhamorikar <advaitdhamorikar@...il.com>
Cc: Steve French <sfrench@...ba.org>, Paulo Alcantara <pc@...guebit.com>, 
	Ronnie Sahlberg <ronniesahlberg@...il.com>, Shyam Prasad N <sprasad@...rosoft.com>, 
	Tom Talpey <tom@...pey.com>, Bharath SM <bharathsm@...rosoft.com>, 
	David Howells <dhowells@...hat.com>, Enzo Matsumiya <ematsumiya@...e.de>, linux-cifs@...r.kernel.org, 
	samba-technical@...ts.samba.org, linux-kernel@...r.kernel.org, 
	skhan@...uxfoundation.org, anupnewsmail@...il.com, 
	Colin Ian King <colin.i.king@...il.com>
Subject: Re: [PATCH v2] smb/client: Fix logically dead code

Merged into cifs-2.6.git for-next

(also FYI - a similar patch was submitted soon after this one by
Colin, but was duplicate)

On Mon, Oct 7, 2024 at 10:23 AM Advait Dhamorikar
<advaitdhamorikar@...il.com> wrote:
>
> The if condition in collect_sample: can never be satisfied
> because of a logical contradiction. The indicated dead code
> may have performed some action; that action will never occur.
>
> Fixes: 94ae8c3fee94 ("smb: client: compress: LZ77 code improvements cleanup")
> Signed-off-by: Advait Dhamorikar <advaitdhamorikar@...il.com>
> ---
> v1->v2: update short log and changelog
>
>  fs/smb/client/compress.c | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/fs/smb/client/compress.c b/fs/smb/client/compress.c
> index 63b5a55b7a57..766b4de13da7 100644
> --- a/fs/smb/client/compress.c
> +++ b/fs/smb/client/compress.c
> @@ -166,7 +166,6 @@ static int collect_sample(const struct iov_iter *iter, ssize_t max, u8 *sample)
>         loff_t start = iter->xarray_start + iter->iov_offset;
>         pgoff_t last, index = start / PAGE_SIZE;
>         size_t len, off, foff;
> -       ssize_t ret = 0;
>         void *p;
>         int s = 0;
>
> @@ -193,9 +192,6 @@ static int collect_sample(const struct iov_iter *iter, ssize_t max, u8 *sample)
>                                 memcpy(&sample[s], p, len2);
>                                 kunmap_local(p);
>
> -                               if (ret < 0)
> -                                       return ret;
> -
>                                 s += len2;
>
>                                 if (len2 < SZ_2K || s >= max - SZ_2K)
> --
> 2.34.1
>


-- 
Thanks,

Steve