diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-25 11:35:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-25 11:35:23 +1000 |
| commit | 320bf23a9e1f3301f9462619ce99c1889a4757a3 (patch) | |
| tree | d1578b68901b5c38ab0e78bde7cd57904afd1ad7 | |
| parent | ea91b55b5d1f93cafadd0fd54bdb69325629f4cf (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 965ece2c7e4d..437b95b15829 100644 --- a/drivers/block/aoe/aoecmd.c +++ b/drivers/block/aoe/aoecmd.c @@ -982,8 +982,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; } |