iw_cxgb4: Fixes static checker warning in c4iw_rdev_open()
authorHariprasad S <hariprasad@chelsio.com>
Tue, 12 Jan 2016 11:03:21 +0000 (16:33 +0530)
committerDoug Ledford <dledford@redhat.com>
Tue, 19 Jan 2016 20:17:40 +0000 (15:17 -0500)
Commit c5dfb000b904 ("iw_cxgb4: Pass qid range to user space driver")
from Dec 11, 2015, leads to the following static checker warning:

drivers/infiniband/hw/cxgb4/device.c:857 c4iw_rdev_open()
        warn: variable dereferenced before check 'rdev->status_page'

Also we weren't deallocating ocqp pool in error path when failed to
allocate status page. Fixing it too.

Fixes: c5dfb000b904 ("iw_cxgb4: Pass qid range to user space driver")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/hw/cxgb4/device.c

index bf155386a71e2dc8368fdac862ac212dab270aaf..2a3490fab914771c7c6625c714eaaaf0c79a991a 100644 (file)
@@ -850,14 +850,12 @@ static int c4iw_rdev_open(struct c4iw_rdev *rdev)
        }
        rdev->status_page = (struct t4_dev_status_page *)
                            __get_free_page(GFP_KERNEL);
+       if (!rdev->status_page)
+               goto destroy_ocqp_pool;
        rdev->status_page->qp_start = rdev->lldi.vr->qp.start;
        rdev->status_page->qp_size = rdev->lldi.vr->qp.size;
        rdev->status_page->cq_start = rdev->lldi.vr->cq.start;
        rdev->status_page->cq_size = rdev->lldi.vr->cq.size;
-       if (!rdev->status_page) {
-               pr_err(MOD "error allocating status page\n");
-               goto err4;
-       }
 
        if (c4iw_wr_log) {
                rdev->wr_log = kzalloc((1 << c4iw_wr_log_size_order) *
@@ -873,6 +871,8 @@ static int c4iw_rdev_open(struct c4iw_rdev *rdev)
        rdev->status_page->db_off = 0;
 
        return 0;
+destroy_ocqp_pool:
+       c4iw_ocqp_pool_destroy(rdev);
 err4:
        c4iw_rqtpool_destroy(rdev);
 err3: