[PATCH] sendfile calls lock_verify_area with wrong parameters

From: Manfred Spraul
Date: Sun Jan 18 2004 - 07:38:29 EST


sendfile supports reading from a given start offset for in_file, like pread. But for the locks_verify_area call, in_file->f_pos is always used, even if a start offset is used. Result: wrong area is checked for mandatory locks.

Fix attached.

--
Manfred
--- 2.6/fs/read_write.c 2004-01-17 12:19:38.000000000 +0100
+++ build-2.6/fs/read_write.c 2004-01-18 13:26:46.000000000 +0100
@@ -544,6 +544,8 @@
ssize_t retval;
int fput_needed_in, fput_needed_out;

+ if (!ppos)
+ ppos = &in_file->f_pos;
/*
* Get input file, and verify that it is ok..
*/
@@ -559,7 +561,7 @@
goto fput_in;
if (!in_file->f_op || !in_file->f_op->sendfile)
goto fput_in;
- retval = locks_verify_area(FLOCK_VERIFY_READ, in_inode, in_file, in_file->f_pos, count);
+ retval = locks_verify_area(FLOCK_VERIFY_READ, in_inode, in_file, *ppos, count);
if (retval)
goto fput_in;

@@ -588,9 +590,6 @@
if (retval)
goto fput_out;

- if (!ppos)
- ppos = &in_file->f_pos;
-
if (!max)
max = min(in_inode->i_sb->s_maxbytes, out_inode->i_sb->s_maxbytes);