From a7c766b2f3cf69667a6011b7cbe3efe76ff08a46 Mon Sep 17 00:00:00 2001
From: Ed Cashin <ecashin@coraid.com>
Date: Thu, 4 Oct 2012 17:16:32 -0700
Subject: [PATCH] --- yaml --- r: 330185 b: refs/heads/master c:
 6583303c5e324a918ee1d57201acd9869f3be6da h: refs/heads/master i:   330183:
 2d9ff01befcf944ee5e1fb31f686ea228f6b1f37 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/block/aoe/aoecmd.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6f537aec9be1..bb032e337d0d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25f4d75ea45cdcc59158bfd1ae162a6ff2071124
+refs/heads/master: 6583303c5e324a918ee1d57201acd9869f3be6da
diff --git a/trunk/drivers/block/aoe/aoecmd.c b/trunk/drivers/block/aoe/aoecmd.c
index e3291dfa7607..2a6a4316db00 100644
--- a/trunk/drivers/block/aoe/aoecmd.c
+++ b/trunk/drivers/block/aoe/aoecmd.c
@@ -1359,6 +1359,13 @@ aoecmd_cfg_rsp(struct sk_buff *skb)
 			"Check shelf dip switches.\n");
 		return;
 	}
+	if (h->minor >= NPERSHELF) {
+		pr_err("aoe: e%ld.%d %s, %d\n",
+			aoemajor, h->minor,
+			"slot number larger than the maximum",
+			NPERSHELF-1);
+		return;
+	}
 
 	sysminor = SYSMINOR(aoemajor, h->minor);
 	if (sysminor * AOE_PARTITIONS + AOE_PARTITIONS > MINORMASK) {