1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 17a15c56028c..43d5166db4c6 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -857,6 +857,8 @@ int rdma_init_qp_attr(struct rdma_cm_id *id, struct ib_qp_attr *qp_attr,
                 } else
                         ret = iw_cm_init_qp_attr(id_priv->cm_id.iw, qp_attr,
                                                  qp_attr_mask);
+                qp_attr->port_num = id_priv->id.port_num;
+                *qp_attr_mask |= IB_QP_PORT;
         } else
                 ret = -ENOSYS;
 
@@ -2578,7 +2580,8 @@ static int cma_bind_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
         if (!src_addr || !src_addr->sa_family) {
                 src_addr = (struct sockaddr *) &id->route.addr.src_addr;
                 src_addr->sa_family = dst_addr->sa_family;
-                if (dst_addr->sa_family == AF_INET6) {
+                if (IS_ENABLED(CONFIG_IPV6) &&
+                    dst_addr->sa_family == AF_INET6) {
                         struct sockaddr_in6 *src_addr6 = (struct sockaddr_in6 *) src_addr;
                         struct sockaddr_in6 *dst_addr6 = (struct sockaddr_in6 *) dst_addr;
                         src_addr6->sin6_scope_id = dst_addr6->sin6_scope_id;
@@ -3348,6 +3351,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;