From c2858683837b2ed60a02c0743f54b373796824b8 Mon Sep 17 00:00:00 2001
From: Jeff Moyer <jmoyer@redhat.com>
Date: Fri, 10 Sep 2010 14:16:00 -0700
Subject: [PATCH] --- yaml --- r: 210662 b: refs/heads/master c:
 75e1c70fc31490ef8a373ea2a4bea2524099b478 h: refs/heads/master v: v3

---
 [refs]         | 2 +-
 trunk/fs/aio.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 08c3812af990..0ce75766d2b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfa88ea7ee9e6b4fd673e45a8cc0a8e0b7ef4761
+refs/heads/master: 75e1c70fc31490ef8a373ea2a4bea2524099b478
diff --git a/trunk/fs/aio.c b/trunk/fs/aio.c
index 3006b5bc33d6..1320b2a05fb2 100644
--- a/trunk/fs/aio.c
+++ b/trunk/fs/aio.c
@@ -1659,6 +1659,9 @@ long do_io_submit(aio_context_t ctx_id, long nr,
 	if (unlikely(nr < 0))
 		return -EINVAL;
 
+	if (unlikely(nr > LONG_MAX/sizeof(*iocbpp)))
+		nr = LONG_MAX/sizeof(*iocbpp);
+
 	if (unlikely(!access_ok(VERIFY_READ, iocbpp, (nr*sizeof(*iocbpp)))))
 		return -EFAULT;