Skip to content

Commit

Permalink
RDMA/amso1100: Add check for NULL reply_msg in c2_intr()
Browse files Browse the repository at this point in the history
Fix a place where we might dereference a NULL pointer; this fixes
Coverity CID 1392.  On inspection I also found a place where we could
attempt to kmem_cache_free() a NULL pointer, so fix this too.

Signed-off-by: Tom Tucker <tom@opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
  • Loading branch information
Tom Tucker authored and Roland Dreier committed Apr 17, 2008
1 parent bbf8eed commit 9285faa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions drivers/infiniband/hw/amso1100/c2_cq.c
Original file line number Diff line number Diff line change
Expand Up @@ -422,8 +422,8 @@ void c2_free_cq(struct c2_dev *c2dev, struct c2_cq *cq)
goto bail1;

reply = (struct c2wr_cq_destroy_rep *) (unsigned long) (vq_req->reply_msg);

vq_repbuf_free(c2dev, reply);
if (reply)
vq_repbuf_free(c2dev, reply);
bail1:
vq_req_free(c2dev, vq_req);
bail0:
Expand Down
6 changes: 5 additions & 1 deletion drivers/infiniband/hw/amso1100/c2_intr.c
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,11 @@ static void handle_vq(struct c2_dev *c2dev, u32 mq_index)
return;
}

err = c2_errno(reply_msg);
if (reply_msg)
err = c2_errno(reply_msg);
else
err = -ENOMEM;

if (!err) switch (req->event) {
case IW_CM_EVENT_ESTABLISHED:
c2_set_qp_state(req->qp,
Expand Down

0 comments on commit 9285faa

Please sign in to comment.