Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9098980 authored by Jeff Layton's avatar Jeff Layton Committed by Al Viro
Browse files

vfs: remove redundant position check in do_sendfile 



As Johannes Weiner pointed out, one of the range checks in do_sendfile
is redundant and is already checked in rw_verify_area.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Reviewed-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Robert Love <rlove@google.com>
Cc: Mandeep Singh Baines <msb@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 42cb56ae

fs/read_write.c

+0 −3
Original line number Diff line number Diff line
@@ -839,9 +839,6 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos, 
		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;

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

		retval = -EOVERFLOW;

		if (pos >= max)