xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RDMA/cxgb4: Initialization errors can cause crash

Browse Source 
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>
This commit is contained in:
Steve Wise
2011-05-09 22:06:22 -07:00
committed by Roland Dreier
parent 30c95c2d49
commit bbe9a0a2bc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/infiniband/hw/cxgb4/device.c
View File

@@ -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)
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)
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",