From 25b9383cd6ea4a45478286357831eefc056b0dec Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Mon, 17 Sep 2012 11:47:13 +0100
Subject: [PATCH] --- yaml --- r: 322981 b: refs/heads/master c:
 2bd6efad25d7c1950008e2ab4e2d6796001919fc h: refs/heads/master i:   322979:
 7e3beeb8af6089544682812916929a55a4b5536e v: v3

---
 [refs]              | 2 +-
 trunk/block/ioctl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6e4e981d087f..411f24945a07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97651ea687d3b6a214c32b49f79523db709fba18
+refs/heads/master: 2bd6efad25d7c1950008e2ab4e2d6796001919fc
diff --git a/trunk/block/ioctl.c b/trunk/block/ioctl.c
index 4476e0e85d16..4a85096f5410 100644
--- a/trunk/block/ioctl.c
+++ b/trunk/block/ioctl.c
@@ -41,7 +41,7 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user
 			    sizeof(long long) > sizeof(long)) {
 				long pstart = start, plength = length;
 				if (pstart != start || plength != length
-				    || pstart < 0 || plength < 0)
+				    || pstart < 0 || plength < 0 || partno > 65535)
 					return -EINVAL;
 			}