Skip to content

Commit

Permalink
RDMA/cxgb4: Initialization errors can cause crash
Browse files Browse the repository at this point in the history
c4iw_uld_add() must return ERR_PTR() values instead of NULL on failure.

Signed-off-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
  • Loading branch information
Steve Wise authored and Roland Dreier committed May 10, 2011
1 parent 30c95c2 commit bbe9a0a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/infiniband/hw/cxgb4/device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
if (!devp) {
printk(KERN_ERR MOD "Cannot allocate ib device\n");
return NULL;
return ERR_PTR(-ENOMEM);
}
devp->rdev.lldi = *infop;

Expand All @@ -414,7 +414,7 @@ static struct c4iw_dev *c4iw_alloc(const struct cxgb4_lld_info *infop)
mutex_unlock(&dev_mutex);
printk(KERN_ERR MOD "Unable to open CXIO rdev err %d\n", ret);
ib_dealloc_device(&devp->ibdev);
return NULL;
return ERR_PTR(ret);
}

idr_init(&devp->cqidr);
Expand Down Expand Up @@ -444,7 +444,7 @@ static void *c4iw_uld_add(const struct cxgb4_lld_info *infop)
DRV_VERSION);

dev = c4iw_alloc(infop);
if (!dev)
if (IS_ERR(dev))
goto out;

PDBG("%s found device %s nchan %u nrxq %u ntxq %u nports %u\n",
Expand Down

0 comments on commit bbe9a0a

Please sign in to comment.