From 21edb121be9a38458d0f8abcccc3cfa9f76e83f3 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 17 May 2020 21:02:43 +0000 Subject: [PATCH] ib_srpt: Fix handling of iWARP logins The path_rec pointer is set for IB and RoCE logins but not for iWARP logins. Hence check the path_rec pointer before dereferencing it. See also upstream commit cbca2442a096 ("RDMA/srpt: Fix handling of iWARP logins") # v5.5. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8934 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- srpt/src/ib_srpt.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c index 989ed72f4..165c1a432 100644 --- a/srpt/src/ib_srpt.c +++ b/srpt/src/ib_srpt.c @@ -3007,6 +3007,11 @@ static int srpt_rdma_cm_req_recv(struct rdma_cm_id *cm_id, struct srpt_device *sdev; struct srp_login_req req; const struct srp_login_req_rdma *req_rdma; + /* + * See also commit c2f8fc4ec440 ("IB/SA: Rename ib_sa_path_rec to + * sa_path_rec") # v4.12. + */ + typeof(cm_id->route.path_rec) path_rec = cm_id->route.path_rec; char src_addr[40]; sdev = ib_get_client_data(cm_id->device, &srpt_client); @@ -3031,7 +3036,7 @@ static int srpt_rdma_cm_req_recv(struct rdma_cm_id *cm_id, inet_ntop(&cm_id->route.addr.src_addr, src_addr, sizeof(src_addr)); return srpt_cm_req_recv(sdev, NULL, cm_id, cm_id->port_num, - cm_id->route.path_rec->pkey, &req, src_addr); + path_rec ? path_rec->pkey : 0, &req, src_addr); } static void srpt_cm_rej_recv(struct srpt_rdma_ch *ch,