linux-kernel - Re: [PATCH] autofs: don't stuck in a loop if vfs

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] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 01 Apr 2016 15:37:46 +0800
From:	Ian Kent <raven@...maw.net>
To:	Andrey Vagin <avagin@...il.com>
Cc:	autofs@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andrey Vagin <avagin@...nvz.org>
Subject: Re: [PATCH] autofs: don't stuck in a loop if vfs_write returns an
 error

On Thu, 2016-03-31 at 22:12 -0700, Andrey Vagin wrote:
> From: Andrey Vagin <avagin@...nvz.org>
> 
> __vfs_write() returns a negative value in a error case.

Ha, right, I'll send this along to Andrew with my next series which
should be soon.

> 
> Cc: Ian Kent <raven@...maw.net>
> Signed-off-by: Andrey Vagin <avagin@...nvz.org>
> ---
>  fs/autofs4/waitq.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
> index 0146d91..631f155 100644
> --- a/fs/autofs4/waitq.c
> +++ b/fs/autofs4/waitq.c
> @@ -66,11 +66,12 @@ static int autofs4_write(struct autofs_sb_info
> *sbi,
>  	set_fs(KERNEL_DS);
>  
>  	mutex_lock(&sbi->pipe_mutex);
> -	wr = __vfs_write(file, data, bytes, &file->f_pos);
> -	while (bytes && wr) {
> +	while (bytes) {
> +		wr = __vfs_write(file, data, bytes, &file->f_pos);
> +		if (wr <= 0)
> +			break;
>  		data += wr;
>  		bytes -= wr;
> -		wr = __vfs_write(file, data, bytes, &file->f_pos);
>  	}
>  	mutex_unlock(&sbi->pipe_mutex);
>