Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git] / fs / nfs / pagelist.c
index be7cbce6e4c7a71c0fbd22a03193e20c9fec55ce..94e16ec88312a3c82857bbcf49815b66a3d5b14c 100644 (file)
@@ -481,6 +481,14 @@ size_t nfs_generic_pg_test(struct nfs_pageio_descriptor *desc,
                return 0;
        }
 
+       /*
+        * Limit the request size so that we can still allocate a page array
+        * for it without upsetting the slab allocator.
+        */
+       if (((desc->pg_count + req->wb_bytes) >> PAGE_SHIFT) *
+                       sizeof(struct page) > PAGE_SIZE)
+               return 0;
+
        return min(desc->pg_bsize - desc->pg_count, (size_t)req->wb_bytes);
 }
 EXPORT_SYMBOL_GPL(nfs_generic_pg_test);