linux-kernel - Re: [PATCH 4/4] vfs: remove redundant checks in do

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]

Message-ID: <20090807205833.GA24668@google.com>
Date:	Fri, 7 Aug 2009 13:58:33 -0700
From:	Mandeep Singh Baines <msb@...gle.com>
To:	Jeff Layton <jlayton@...hat.com>
Cc:	linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org,
	akpm@...ux-foundation.org, hch@...radead.org, rlove@...gle.com,
	viro@...iv.linux.org.uk, hannes@...xchg.org
Subject: Re: [PATCH 4/4] vfs: remove redundant checks in do_sendfile

Jeff Layton (jlayton@...hat.com) wrote:
> As Johannes Weiner pointed out, a couple of the range checks in do_sendfile
> are redundant and are already checked in rw_verify_area.
> 
> Signed-off-by: Jeff Layton <jlayton@...hat.com>
> ---
>  fs/read_write.c |   11 -----------
>  1 files changed, 0 insertions(+), 11 deletions(-)
> 
> diff --git a/fs/read_write.c b/fs/read_write.c
> index 6c8c55d..9c3d98b 100644
> --- a/fs/read_write.c
> +++ b/fs/read_write.c
> @@ -792,7 +792,6 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos,
>  {
>  	struct file * in_file, * out_file;
>  	struct inode * in_inode, * out_inode;
> -	loff_t pos;
>  	ssize_t retval;
>  	int fput_needed_in, fput_needed_out, fl;
>  
> @@ -838,17 +837,7 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos,
>  	if (!max)
>  		max = min(in_inode->i_sb->s_maxbytes, out_inode->i_sb->s_maxbytes);
>  
> -	pos = *ppos;
>  	retval = -EINVAL;
> -	if (unlikely(pos < 0))
> -		goto fput_out;

Agree. This check is redundant.

> -	if (unlikely(pos + count > max)) {

rw_verify_area does not check s_maxbytes so aren't the checks against
max still required?

> -		retval = -EOVERFLOW;
> -		if (pos >= max)
> -			goto fput_out;
> -		count = max - pos;
> -	}
> -
>  	fl = 0;
>  #if 0
>  	/*
> -- 
> 1.6.0.6
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/