Unverified Commit 0e33f34a authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13444 RDMA/rtrs-srv: Avoid null pointer deref during path establishment 

Merge Pull Request from: @ci-robot 
 
PR sync from: Dong Chenchen <dongchenchen2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/YYV67U2BLDIN36ROWMAS4S2U4S6AFKDA/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYRIA 
 
Link:https://gitee.com/openeuler/kernel/pulls/13444

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 38884ed0 8e1183ad

drivers/infiniband/ulp/rtrs/rtrs-srv.c

+11 −2
Original line number Diff line number Diff line
@@ -909,12 +909,11 @@ static void rtrs_srv_info_req_done(struct ib_cq *cq, struct ib_wc *wc) 
	if (unlikely(err))

		goto close;



out:

	rtrs_iu_free(iu, sess->s.dev->ib_dev, 1);

	return;

close:

	rtrs_iu_free(iu, sess->s.dev->ib_dev, 1);

	close_sess(sess);

	goto out;

}



static int post_recv_info_req(struct rtrs_srv_con *con)
@@ -965,6 +964,16 @@ static int post_recv_sess(struct rtrs_srv_sess *sess) 
			q_size = SERVICE_CON_QUEUE_DEPTH;

		else

			q_size = srv->queue_depth;

		if (sess->state != RTRS_SRV_CONNECTING) {

			rtrs_err(s, "Path state invalid. state %s\n",

				 rtrs_srv_state_str(sess->state));

			return -EIO;

		}



		if (!sess->s.con[cid]) {

			rtrs_err(s, "Conn not set for %d\n", cid);

			return -EIO;

		}



		err = post_recv_io(to_srv_con(sess->s.con[cid]), q_size);

		if (unlikely(err)) {