Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[cascardo/linux.git] / drivers / scsi / libfc / fc_exch.c

diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
index 30f9ef0..e72673b 100644 (file)
--- a/drivers/scsi/libfc/fc_exch.c
+++ b/drivers/scsi/libfc/fc_exch.c
@@ -908,9 +908,17 @@ static struct fc_exch *fc_exch_find(struct fc_exch_mgr *mp, u16 xid)
 {
        struct fc_exch_pool *pool;
        struct fc_exch *ep = NULL;
+       u16 cpu = xid & fc_cpu_mask;
+
+       if (cpu >= nr_cpu_ids || !cpu_possible(cpu)) {
+               printk_ratelimited(KERN_ERR
+                       "libfc: lookup request for XID = %d, "
+                       "indicates invalid CPU %d\n", xid, cpu);
+               return NULL;
+       }
 
        if ((xid >= mp->min_xid) && (xid <= mp->max_xid)) {
-               pool = per_cpu_ptr(mp->pool, xid & fc_cpu_mask);
+               pool = per_cpu_ptr(mp->pool, cpu);
                spin_lock_bh(&pool->lock);
                ep = fc_exch_ptr_get(pool, (xid - mp->min_xid) >> fc_cpu_order);
                if (ep) {