lkml.org 
[lkml]   [2002]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [bkpatch] add sys_sendfile64
Okay, here are the checks for overflow and page faults.  Again, pull from 

bk://bcrlbits.bkbits.net/linux-2.5

To grab the updates, or apply this on top of the previous patch.

-ben
--
"A man with a bass just walked in,
and he's putting it down
on the floor."

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.467 -> 1.468
# mm/filemap.c 1.64 -> 1.65
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/03/04 bcrl@toomuch.toronto.redhat.com 1.468
# Add LFS style EOVERFLOW checks to sendfile*
# --------------------------------------------
#
diff -Nru a/mm/filemap.c b/mm/filemap.c
--- a/mm/filemap.c Mon Mar 4 11:25:28 2002
+++ b/mm/filemap.c Mon Mar 4 11:25:28 2002
@@ -1715,7 +1715,7 @@
return written;
}

-static ssize_t common_sendfile(int out_fd, int in_fd, loff_t *offset, size_t count)
+static ssize_t common_sendfile(int out_fd, int in_fd, loff_t *offset, size_t count, loff_t max)
{
ssize_t retval;
struct file * in_file, * out_file;
@@ -1760,10 +1760,22 @@
retval = 0;
if (count) {
read_descriptor_t desc;
+ loff_t pos;

if (!offset)
offset = &in_file->f_pos;

+ pos = *offset;
+ retval = -EINVAL;
+ if (unlikely(pos < 0))
+ goto fput_out;
+ if (unlikely(pos + count > max)) {
+ retval = -EOVERFLOW;
+ if (pos >= max)
+ goto fput_out;
+ count = max - pos;
+ }
+
desc.written = 0;
desc.count = count;
desc.buf = (char *) out_file;
@@ -1773,6 +1785,9 @@
retval = desc.written;
if (!retval)
retval = desc.error;
+ pos = *offset;
+ if (pos > max)
+ retval = -EOVERFLOW;
}

fput_out:
@@ -1794,9 +1809,9 @@
pos = off;
ppos = &pos;
}
- ret = common_sendfile(out_fd, in_fd, ppos, count);
- if (offset)
- put_user((off_t)pos, offset);
+ ret = common_sendfile(out_fd, in_fd, ppos, count, MAX_NON_LFS);
+ if (offset && put_user(pos, offset))
+ ret = -EFAULT;
return ret;
}

@@ -1809,9 +1824,9 @@
return -EFAULT;
ppos = &pos;
}
- ret = common_sendfile(out_fd, in_fd, ppos, count);
- if (offset)
- put_user(pos, offset);
+ ret = common_sendfile(out_fd, in_fd, ppos, count, MAX_LFS_FILESIZE);
+ if (offset && put_user(pos, offset))
+ ret = -EFAULT;
return ret;
}

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 13:24    [W:0.044 / U:20.108 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site