5 files changed, 60 insertions, 18 deletions

diff --git a/fs/9p/trans_sock.c b/fs/9p/trans_sock.c
index a93c2bf94c33..6a9a75d40f73 100644
--- a/fs/9p/trans_sock.c
+++ b/fs/9p/trans_sock.c
@@ -26,6 +26,7 @@
  */
 
 #include <linux/config.h>
+#include <linux/in.h>
 #include <linux/module.h>
 #include <linux/net.h>
 #include <linux/ipv6.h>
diff --git a/fs/bio.c b/fs/bio.c
index 460554b07ff9..38d3e8023a07 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -313,7 +313,8 @@ int bio_get_nr_vecs(struct block_device *bdev)
 }
 
 static int __bio_add_page(request_queue_t *q, struct bio *bio, struct page
-                          *page, unsigned int len, unsigned int offset)
+                          *page, unsigned int len, unsigned int offset,
+                          unsigned short max_sectors)
 {
         int retried_segments = 0;
         struct bio_vec *bvec;
@@ -327,7 +328,7 @@ static int __bio_add_page(request_queue_t *q, struct bio *bio, struct page
         if (bio->bi_vcnt >= bio->bi_max_vecs)
                 return 0;
 
-        if (((bio->bi_size + len) >> 9) > q->max_sectors)
+        if (((bio->bi_size + len) >> 9) > max_sectors)
                 return 0;
 
         /*
@@ -386,6 +387,25 @@ static int __bio_add_page(request_queue_t *q, struct bio *bio, struct page
 }
 
 /**
+ *      bio_add_pc_page -       attempt to add page to bio
+ *      @bio: destination bio
+ *      @page: page to add
+ *      @len: vec entry length
+ *      @offset: vec entry offset
+ *
+ *      Attempt to add a page to the bio_vec maplist. This can fail for a
+ *      number of reasons, such as the bio being full or target block
+ *      device limitations. The target block device must allow bio's
+ *      smaller than PAGE_SIZE, so it is always possible to add a single
+ *      page to an empty bio. This should only be used by REQ_PC bios.
+ */
+int bio_add_pc_page(request_queue_t *q, struct bio *bio, struct page *page,
+                    unsigned int len, unsigned int offset)
+{
+        return __bio_add_page(q, bio, page, len, offset, q->max_hw_sectors);
+}
+
+/**
  *      bio_add_page    -       attempt to add page to bio
  *      @bio: destination bio
  *      @page: page to add
@@ -401,8 +421,8 @@ static int __bio_add_page(request_queue_t *q, struct bio *bio, struct page
 int bio_add_page(struct bio *bio, struct page *page, unsigned int len,
                  unsigned int offset)
 {
-        return __bio_add_page(bdev_get_queue(bio->bi_bdev), bio, page,
-                              len, offset);
+        struct request_queue *q = bdev_get_queue(bio->bi_bdev);
+        return __bio_add_page(q, bio, page, len, offset, q->max_sectors);
 }
 
 struct bio_map_data {
@@ -514,7 +534,7 @@ struct bio *bio_copy_user(request_queue_t *q, unsigned long uaddr,
                         break;
                 }
 
-                if (__bio_add_page(q, bio, page, bytes, 0) < bytes) {
+                if (bio_add_pc_page(q, bio, page, bytes, 0) < bytes) {
                         ret = -EINVAL;
                         break;
                 }
@@ -628,7 +648,8 @@ static struct bio *__bio_map_user_iov(request_queue_t *q,
                         /*
                          * sorry...
                          */
-                        if (__bio_add_page(q, bio, pages[j], bytes, offset) < bytes)
+                        if (bio_add_pc_page(q, bio, pages[j], bytes, offset) <
+                                            bytes)
                                 break;
 
                         len -= bytes;
@@ -801,8 +822,8 @@ static struct bio *__bio_map_kern(request_queue_t *q, void *data,
                 if (bytes > len)
                         bytes = len;
 
-                if (__bio_add_page(q, bio, virt_to_page(data), bytes,
-                                   offset) < bytes)
+                if (bio_add_pc_page(q, bio, virt_to_page(data), bytes,
+                                    offset) < bytes)
                         break;
 
                 data += bytes;
@@ -1228,6 +1249,7 @@ EXPORT_SYMBOL(bio_clone);
 EXPORT_SYMBOL(bio_phys_segments);
 EXPORT_SYMBOL(bio_hw_segments);
 EXPORT_SYMBOL(bio_add_page);
+EXPORT_SYMBOL(bio_add_pc_page);
 EXPORT_SYMBOL(bio_get_nr_vecs);
 EXPORT_SYMBOL(bio_map_user);
 EXPORT_SYMBOL(bio_unmap_user);
diff --git a/fs/compat.c b/fs/compat.c
index 818634120b69..55ac0324aaf1 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -1170,7 +1170,7 @@ static ssize_t compat_do_readv_writev(int type, struct file *file,
         }
 
         ret = rw_verify_area(type, file, pos, tot_len);
-        if (ret)
+        if (ret < 0)
                 goto out;
 
         fnv = NULL;
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index f2ca782aba33..30cae3602867 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -14,6 +14,9 @@
 #include <linux/sunrpc/svc.h>
 #include <linux/sunrpc/svcsock.h>
 #include <linux/nfs_fs.h>
+
+#include <net/inet_sock.h>
+
 #include "nfs4_fs.h"
 #include "callback.h"
 
diff --git a/fs/read_write.c b/fs/read_write.c
index a091ee4f430d..df3468a22fea 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -14,6 +14,7 @@
 #include <linux/security.h>
 #include <linux/module.h>
 #include <linux/syscalls.h>
+#include <linux/pagemap.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
@@ -182,22 +183,33 @@ bad:
 }
 #endif
 
+/*
+ * rw_verify_area doesn't like huge counts. We limit
+ * them to something that fits in "int" so that others
+ * won't have to do range checks all the time.
+ */
+#define MAX_RW_COUNT (INT_MAX & PAGE_CACHE_MASK)
 
 int rw_verify_area(int read_write, struct file *file, loff_t *ppos, size_t count)
 {
         struct inode *inode;
         loff_t pos;
 
-        if (unlikely(count > INT_MAX))
+        if (unlikely((ssize_t) count < 0))
                 goto Einval;
         pos = *ppos;
         if (unlikely((pos < 0) || (loff_t) (pos + count) < 0))
                 goto Einval;
 
         inode = file->f_dentry->d_inode;
-        if (inode->i_flock && MANDATORY_LOCK(inode))
-                return locks_mandatory_area(read_write == READ ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE, inode, file, pos, count);
-        return 0;
+        if (inode->i_flock && MANDATORY_LOCK(inode)) {
+                int retval = locks_mandatory_area(
+                        read_write == READ ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE,
+                        inode, file, pos, count);
+                if (retval < 0)
+                        return retval;
+        }
+        return count > MAX_RW_COUNT ? MAX_RW_COUNT : count;
 
 Einval:
         return -EINVAL;
@@ -244,7 +256,8 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
                 return -EFAULT;
 
         ret = rw_verify_area(READ, file, pos, count);
-        if (!ret) {
+        if (ret >= 0) {
+                count = ret;
                 ret = security_file_permission (file, MAY_READ);
                 if (!ret) {
                         if (file->f_op->read)
@@ -295,7 +308,8 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
                 return -EFAULT;
 
         ret = rw_verify_area(WRITE, file, pos, count);
-        if (!ret) {
+        if (ret >= 0) {
+                count = ret;
                 ret = security_file_permission (file, MAY_WRITE);
                 if (!ret) {
                         if (file->f_op->write)
@@ -497,7 +511,7 @@ static ssize_t do_readv_writev(int type, struct file *file,
         }
 
         ret = rw_verify_area(type, file, pos, tot_len);
-        if (ret)
+        if (ret < 0)
                 goto out;
         ret = security_file_permission(file, type == READ ? MAY_READ : MAY_WRITE);
         if (ret)
@@ -653,8 +667,9 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos,
                 if (!(in_file->f_mode & FMODE_PREAD))
                         goto fput_in;
         retval = rw_verify_area(READ, in_file, ppos, count);
-        if (retval)
+        if (retval < 0)
                 goto fput_in;
+        count = retval;
 
         retval = security_file_permission (in_file, MAY_READ);
         if (retval)
@@ -674,8 +689,9 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos,
                 goto fput_out;
         out_inode = out_file->f_dentry->d_inode;
         retval = rw_verify_area(WRITE, out_file, &out_file->f_pos, count);
-        if (retval)
+        if (retval < 0)
                 goto fput_out;
+        count = retval;
 
         retval = security_file_permission (out_file, MAY_WRITE);
         if (retval)