summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSteve Wise <swise@opengridcomputing.com>2017-02-21 11:21:57 -0800
committerBen Hutchings <ben@decadent.org.uk>2017-06-05 21:17:13 +0100
commitedf8cc534c92abc57367603fbdfdfcf288703825 (patch)
tree63ec3c5f03e2511554d0012acb3afe898d344af2 /drivers
parent7b5736f6b0378cc8ec9ec5888153300112a5b057 (diff)
downloadlinux-stable-edf8cc534c92abc57367603fbdfdfcf288703825.tar.gz
linux-stable-edf8cc534c92abc57367603fbdfdfcf288703825.tar.bz2
linux-stable-edf8cc534c92abc57367603fbdfdfcf288703825.zip
rdma_cm: fail iwarp accepts w/o connection params
commit f2625f7db4dd0bbd16a9c7d2950e7621f9aa57ad upstream. cma_accept_iw() needs to return an error if conn_params is NULL. Since this is coming from user space, we can crash. Reported-by: Shaobo He <shaobo@cs.utah.edu> Acked-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Steve Wise <swise@opengridcomputing.com> Signed-off-by: Doug Ledford <dledford@redhat.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/infiniband/core/cma.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index cf3d9dee8aff..fb9bb266a517 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -2952,6 +2952,9 @@ static int cma_accept_iw(struct rdma_id_private *id_priv,
struct iw_cm_conn_param iw_param;
int ret;
+ if (!conn_param)
+ return -EINVAL;
+
ret = cma_modify_qp_rtr(id_priv, conn_param);
if (ret)
return ret;