diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-03 13:46:34 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-03 13:46:34 +1000 |
| commit | 937a0974cf3a400be2205829f6915bde6a0e0481 (patch) | |
| tree | bda0ccda6b3dcd48e7cb499f24da4977f962e82a | |
| parent | 3296fd1c441125503cdb8f83fcc6e605ba9eaca8 (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 5674bd01d96d..b1e5c624b110 100644 --- a/drivers/block/aoe/aoecmd.c +++ b/drivers/block/aoe/aoecmd.c @@ -987,8 +987,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; } |