diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-30 12:23:13 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-30 12:23:13 +1000 |
| commit | 6846d2bd2ad43f0e2ca2f25b911e81bffeb8a661 (patch) | |
| tree | 4a34ef31b89226ae62bc36277a77990afd3c19da | |
| parent | a2e8eaaef6a5e42e77c49b7e7fe4387e0e60dbf3 (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; } |