svn commit: r337088 - in stable/11/sys/ofed: drivers/infiniband/core include/rdma

[Hans Petter Selasky]

Author: hselasky
Date: Thu Aug  2 08:25:48 2018
New Revision: 337088
URL: https://svnweb.freebsd.org/changeset/base/337088

Log:
  MFC r336383:
  Check port number supplied by user verbs cmds in ibcore.
  
  The ib_uverbs_create_ah() ind ib_uverbs_modify_qp() calls receive
  the port number from user input as part of its attributes and assumes
  it is valid. Down on the stack, that parameter is used to access kernel
  data structures.  If the value is invalid, the kernel accesses memory
  it should not.  To prevent this, verify the port number before using it.
  
  Linux commit:
  5ecce4c9b17bed4dc9cb58bfb10447307569b77b
  a62ab66b13a0f9bcb17b7b761f6670941ed5cd62
  5a7a88f1b488e4ee49eb3d5b82612d4d9ffdf2c3
  
  Sponsored by:		Mellanox Technologies

Modified:
  stable/11/sys/ofed/drivers/infiniband/core/ib_cma.c
  stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_cmd.c
  stable/11/sys/ofed/include/rdma/ib_verbs.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_cma.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_cma.c	Thu Aug  2 08:24:45 2018	(r337087)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_cma.c	Thu Aug  2 08:25:48 2018	(r337088)
@@ -983,6 +983,8 @@ int rdma_init_qp_attr(struct rdma_cm_id *id, struct ib
 		} 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;
 

Modified: stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_cmd.c
==============================================================================
--- stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_cmd.c	Thu Aug  2 08:24:45 2018	(r337087)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_uverbs_cmd.c	Thu Aug  2 08:25:48 2018	(r337088)
@@ -2366,6 +2366,25 @@ ssize_t ib_uverbs_modify_qp(struct ib_uverbs_file *fil
 		goto out;
 	}
 
+	if ((cmd.attr_mask & IB_QP_PORT) &&
+	    !rdma_is_port_valid(qp->device, cmd.port_num)) {
+		ret = -EINVAL;
+		goto release_qp;
+	}
+
+	if ((cmd.attr_mask & IB_QP_AV) &&
+	    !rdma_is_port_valid(qp->device, cmd.dest.port_num)) {
+		ret = -EINVAL;
+		goto release_qp;
+	}
+
+	if ((cmd.attr_mask & IB_QP_ALT_PATH) &&
+	    (!rdma_is_port_valid(qp->device, cmd.alt_port_num) ||
+	    !rdma_is_port_valid(qp->device, cmd.alt_dest.port_num))) {
+		ret = -EINVAL;
+		goto release_qp;
+	}
+
 	attr->qp_state 		  = cmd.qp_state;
 	attr->cur_qp_state 	  = cmd.cur_qp_state;
 	attr->path_mtu 		  = cmd.path_mtu;
@@ -2895,6 +2914,9 @@ ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *fil
 
 	if (copy_from_user(&cmd, buf, sizeof cmd))
 		return -EFAULT;
+
+	if (!rdma_is_port_valid(ib_dev, cmd.attr.port_num))
+		return -EINVAL;
 
 	INIT_UDATA(&udata, buf + sizeof(cmd),
 		   (unsigned long)cmd.response + sizeof(resp),

Modified: stable/11/sys/ofed/include/rdma/ib_verbs.h
==============================================================================
--- stable/11/sys/ofed/include/rdma/ib_verbs.h	Thu Aug  2 08:24:45 2018	(r337087)
+++ stable/11/sys/ofed/include/rdma/ib_verbs.h	Thu Aug  2 08:25:48 2018	(r337088)
@@ -2268,6 +2268,13 @@ static inline u8 rdma_end_port(const struct ib_device 
 	return rdma_cap_ib_switch(device) ? 0 : device->phys_port_cnt;
 }
 
+static inline int rdma_is_port_valid(const struct ib_device *device,
+				     unsigned int port)
+{
+	return (port >= rdma_start_port(device) &&
+		port <= rdma_end_port(device));
+}
+
 static inline bool rdma_protocol_ib(const struct ib_device *device, u8 port_num)
 {
 	return device->port_immutable[port_num].core_cap_flags & RDMA_CORE_CAP_PROT_IB;