Commit 44334bd9 authored by Eric Sesterhenn's avatar Eric Sesterhenn Committed by Roland Dreier

RDMA/amso1100: Fix error path in c2_llp_accept()

Another NULL dereference spotted by the Coverity checker (cid #1395):
In case we can't alloc the vq_req, we goto bail1, where we call
vq_req_free(c2dev, vq_req); which then dereferences vq_req.
Signed-off-by: default avatarEric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Acked-by: default avatarTom Tucker <tom@opengridcomputing.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 6edf6023
...@@ -302,7 +302,7 @@ int c2_llp_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param) ...@@ -302,7 +302,7 @@ int c2_llp_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param)
vq_req = vq_req_alloc(c2dev); vq_req = vq_req_alloc(c2dev);
if (!vq_req) { if (!vq_req) {
err = -ENOMEM; err = -ENOMEM;
goto bail1; goto bail0;
} }
vq_req->qp = qp; vq_req->qp = qp;
vq_req->cm_id = cm_id; vq_req->cm_id = cm_id;
...@@ -311,7 +311,7 @@ int c2_llp_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param) ...@@ -311,7 +311,7 @@ int c2_llp_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param)
wr = kmalloc(c2dev->req_vq.msg_size, GFP_KERNEL); wr = kmalloc(c2dev->req_vq.msg_size, GFP_KERNEL);
if (!wr) { if (!wr) {
err = -ENOMEM; err = -ENOMEM;
goto bail2; goto bail1;
} }
/* Build the WR */ /* Build the WR */
...@@ -331,7 +331,7 @@ int c2_llp_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param) ...@@ -331,7 +331,7 @@ int c2_llp_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param)
/* Validate private_data length */ /* Validate private_data length */
if (iw_param->private_data_len > C2_MAX_PRIVATE_DATA_SIZE) { if (iw_param->private_data_len > C2_MAX_PRIVATE_DATA_SIZE) {
err = -EINVAL; err = -EINVAL;
goto bail2; goto bail1;
} }
if (iw_param->private_data) { if (iw_param->private_data) {
...@@ -348,19 +348,19 @@ int c2_llp_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param) ...@@ -348,19 +348,19 @@ int c2_llp_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param)
err = vq_send_wr(c2dev, (union c2wr *) wr); err = vq_send_wr(c2dev, (union c2wr *) wr);
if (err) { if (err) {
vq_req_put(c2dev, vq_req); vq_req_put(c2dev, vq_req);
goto bail2; goto bail1;
} }
/* Wait for reply from adapter */ /* Wait for reply from adapter */
err = vq_wait_for_reply(c2dev, vq_req); err = vq_wait_for_reply(c2dev, vq_req);
if (err) if (err)
goto bail2; goto bail1;
/* Check that reply is present */ /* Check that reply is present */
reply = (struct c2wr_cr_accept_rep *) (unsigned long) vq_req->reply_msg; reply = (struct c2wr_cr_accept_rep *) (unsigned long) vq_req->reply_msg;
if (!reply) { if (!reply) {
err = -ENOMEM; err = -ENOMEM;
goto bail2; goto bail1;
} }
err = c2_errno(reply); err = c2_errno(reply);
...@@ -368,9 +368,8 @@ int c2_llp_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param) ...@@ -368,9 +368,8 @@ int c2_llp_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param)
if (!err) if (!err)
c2_set_qp_state(qp, C2_QP_STATE_RTS); c2_set_qp_state(qp, C2_QP_STATE_RTS);
bail2:
kfree(wr);
bail1: bail1:
kfree(wr);
vq_req_free(c2dev, vq_req); vq_req_free(c2dev, vq_req);
bail0: bail0:
if (err) { if (err) {
......
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