linux-kernel - Re: [PATCH] fs/pipe.c: merge if statements with identical conditions

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 for Android: free password hash cracker in your pocket

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

Message-ID: <20250307225408.GC28762@redhat.com>
Date: Fri, 7 Mar 2025 23:54:08 +0100
From: Oleg Nesterov <oleg@...hat.com>
To: Rasmus Villemoes <linux@...musvillemoes.dk>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>,
	David Howells <dhowells@...hat.com>, Jan Kara <jack@...e.cz>,
	linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] fs/pipe.c: merge if statements with identical conditions

On 03/07, Rasmus Villemoes wrote:
>
> As 'head' is not updated after head+1 is assigned to pipe->head, the
> condition being tested here is exactly the same as in the big if
> statement just above. Merge the two bodies.

Yes.

But Mateusz has already sent the same patch, please see

	[PATCH 1/3] pipe: drop an always true check in anon_pipe_write()
	https://lore.kernel.org/all/20250303230409.452687-2-mjguzik@gmail.com/

Oleg.

> Signed-off-by: Rasmus Villemoes <linux@...musvillemoes.dk>
> ---
>  fs/pipe.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/fs/pipe.c b/fs/pipe.c
> index 097400cce241..27385e3e5417 100644
> --- a/fs/pipe.c
> +++ b/fs/pipe.c
> @@ -547,10 +547,8 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
>
>  			if (!iov_iter_count(from))
>  				break;
> -		}
> -
> -		if (!pipe_full(head, pipe->tail, pipe->max_usage))
>  			continue;
> +		}
>
>  		/* Wait for buffer space to become available. */
>  		if ((filp->f_flags & O_NONBLOCK) ||
> --
> 2.48.1
>