diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-11 15:49:59 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-11 15:49:59 +1100 |
| commit | b95ea43ba4cf9e3e1f8f3ee9899e7048c3c13a80 (patch) | |
| tree | d92ce605cf1b3261608ba471cc6ad5d9c121c524 | |
| parent | 15806382690201a6d49f94e2aa6ea9b1323a98c6 (diff) | |
| parent | c3643395dc3b8d47932e2bbc2992532ae88ee522 (diff) | |
Merge branch 'quilt/aoe'
| -rw-r--r-- | drivers/block/aoe/aoecmd.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c index 64a223b0cc22..eabc01a25813 100644 --- a/drivers/block/aoe/aoecmd.c +++ b/drivers/block/aoe/aoecmd.c @@ -986,8 +986,12 @@ aoecmd_cfg_rsp(struct sk_buff *skb) } sysminor = SYSMINOR(aoemajor, h->minor); - if (sysminor * AOE_PARTITIONS + AOE_PARTITIONS > MINORMASK) { - printk(KERN_INFO "aoe: e%ld.%d: minor number too large\n", + if (h->minor >= NPERSHELF) { + printk(KERN_INFO "aoe: e%ld.%d: AoE minor address too large\n", + aoemajor, (int) h->minor); + return; + } else if (sysminor * AOE_PARTITIONS + AOE_PARTITIONS > MINORMASK) { + printk(KERN_INFO "aoe: e%ld.%d: AoE major address too large\n", aoemajor, (int) h->minor); return; } |