Commit bbe9a0a2 authored by Steve Wise's avatar Steve Wise Committed by Roland Dreier

RDMA/cxgb4: Initialization errors can cause crash

c4iw_uld_add() must return ERR_PTR() values instead of NULL on failure.
Signed-off-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 30c95c2d
...@@ -392,7 +392,7 @@ static struct c4iw_dev *c4iw_alloc(const struct cxgb4_lld_info *infop) ...@@ -392,7 +392,7 @@ static struct c4iw_dev *c4iw_alloc(const struct cxgb4_lld_info *infop)
devp = (struct c4iw_dev *)ib_alloc_device(sizeof(*devp)); devp = (struct c4iw_dev *)ib_alloc_device(sizeof(*devp));
if (!devp) { if (!devp) {
printk(KERN_ERR MOD "Cannot allocate ib device\n"); printk(KERN_ERR MOD "Cannot allocate ib device\n");
return NULL; return ERR_PTR(-ENOMEM);
} }
devp->rdev.lldi = *infop; devp->rdev.lldi = *infop;
...@@ -414,7 +414,7 @@ static struct c4iw_dev *c4iw_alloc(const struct cxgb4_lld_info *infop) ...@@ -414,7 +414,7 @@ static struct c4iw_dev *c4iw_alloc(const struct cxgb4_lld_info *infop)
mutex_unlock(&dev_mutex); mutex_unlock(&dev_mutex);
printk(KERN_ERR MOD "Unable to open CXIO rdev err %d\n", ret); printk(KERN_ERR MOD "Unable to open CXIO rdev err %d\n", ret);
ib_dealloc_device(&devp->ibdev); ib_dealloc_device(&devp->ibdev);
return NULL; return ERR_PTR(ret);
} }
idr_init(&devp->cqidr); idr_init(&devp->cqidr);
...@@ -444,7 +444,7 @@ static void *c4iw_uld_add(const struct cxgb4_lld_info *infop) ...@@ -444,7 +444,7 @@ static void *c4iw_uld_add(const struct cxgb4_lld_info *infop)
DRV_VERSION); DRV_VERSION);
dev = c4iw_alloc(infop); dev = c4iw_alloc(infop);
if (!dev) if (IS_ERR(dev))
goto out; goto out;
PDBG("%s found device %s nchan %u nrxq %u ntxq %u nports %u\n", PDBG("%s found device %s nchan %u nrxq %u ntxq %u nports %u\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment