Skip to content

Commit

Permalink
use use SEEK_MAX to validate user lseek arguments
Browse files Browse the repository at this point in the history
Add SEEK_MAX and use it to validate lseek arguments from userspace.

Signed-off-by: Chris Snook <csnook@redhat.com>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Chris Snook authored and Linus Torvalds committed May 8, 2007
1 parent 7b8e892 commit 1ae7075
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions fs/read_write.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ asmlinkage off_t sys_lseek(unsigned int fd, off_t offset, unsigned int origin)
goto bad;

retval = -EINVAL;
if (origin <= 2) {
if (origin <= SEEK_MAX) {
loff_t res = vfs_llseek(file, offset, origin);
retval = res;
if (res != (loff_t)retval)
Expand All @@ -166,7 +166,7 @@ asmlinkage long sys_llseek(unsigned int fd, unsigned long offset_high,
goto bad;

retval = -EINVAL;
if (origin > 2)
if (origin > SEEK_MAX)
goto out_putf;

offset = vfs_llseek(file, ((loff_t) offset_high << 32) | offset_low,
Expand Down
1 change: 1 addition & 0 deletions include/linux/fs.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#define SEEK_SET 0 /* seek relative to beginning of file */
#define SEEK_CUR 1 /* seek relative to current file position */
#define SEEK_END 2 /* seek relative to end of file */
#define SEEK_MAX SEEK_END

/* And dynamically-tunable limits and defaults: */
struct files_stat_struct {
Expand Down

0 comments on commit 1ae7075

Please sign in to comment.