projects
/
wrapfs-5.3.y.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
554e4b6
)
IB/mlx5: Fix NULL pointer dereference on debug print
author
Eli Cohen
<eli@mellanox.com>
Thu, 27 Oct 2016 13:36:46 +0000
(16:36 +0300)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Sat, 26 Nov 2016 08:56:58 +0000
(09:56 +0100)
commit
a1ab8402d15d2305d2315d96ec3294bfdf16587e
upstream.
For XRC QP CQs may not exist. Check before attempting dereference.
Fixes: e126ba97dba9 ('mlx5: Add driver for Mellanox Connect-IB adapters')
Signed-off-by: Eli Cohen <eli@mellanox.com>
Signed-off-by: Maor Gottlieb <maorg@mellanox.com>
Reviewed-by: Yishai Hadas <yishaih@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/infiniband/hw/mlx5/qp.c
patch
|
blob
|
history
diff --git
a/drivers/infiniband/hw/mlx5/qp.c
b/drivers/infiniband/hw/mlx5/qp.c
index 304e39fd3c91dfe67d67f3bfc1d708395e45f5a8..19d590d3948477d97d7f8ed6ea89882b65841e14 100644
(file)
--- a/
drivers/infiniband/hw/mlx5/qp.c
+++ b/
drivers/infiniband/hw/mlx5/qp.c
@@
-2037,8
+2037,8
@@
struct ib_qp *mlx5_ib_create_qp(struct ib_pd *pd,
mlx5_ib_dbg(dev, "ib qpnum 0x%x, mlx qpn 0x%x, rcqn 0x%x, scqn 0x%x\n",
qp->ibqp.qp_num, qp->trans_qp.base.mqp.qpn,
-
to_mcq(init_attr->recv_cq)->mcq.cqn
,
-
to_mcq(init_attr->send_cq)->mcq.cqn
);
+
init_attr->recv_cq ? to_mcq(init_attr->recv_cq)->mcq.cqn : -1
,
+
init_attr->send_cq ? to_mcq(init_attr->send_cq)->mcq.cqn : -1
);
qp->trans_qp.xrcdn = xrcdn;