]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
rdma_cm: fail iwarp accepts w/o connection params
authorSteve Wise <swise@opengridcomputing.com>
Tue, 21 Feb 2017 19:21:57 +0000 (11:21 -0800)
committerThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Thu, 6 Apr 2017 08:21:47 +0000 (09:21 +0100)
BugLink: http://bugs.launchpad.net/bugs/1673538
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
drivers/infiniband/core/cma.c

index c9dcad6a53bf3b9bbe617cfde0622b8f71ccd5bf..3f5741a3e728ee9ecc3e8ad303e0d7043a80f712 100644 (file)
@@ -3349,6 +3349,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;