svn commit: r337081 - stable/11/sys/ofed/drivers/infiniband/core

[Hans Petter Selasky]

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

Log:
  MFC r336375:
  Fix access to non-initialized CM_ID object in ibcore.
  
  The attempt to join multicast group without ensuring that CMA device
  exists will lead to the following crash reported by syzkaller.
  
  Linux commit:
  7688f2c3bbf55e52388e37ac5d63ca471a7712e1
  
  Sponsored by:		Mellanox Technologies

Modified:
  stable/11/sys/ofed/drivers/infiniband/core/ib_cma.c
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:18:11 2018	(r337080)
+++ stable/11/sys/ofed/drivers/infiniband/core/ib_cma.c	Thu Aug  2 08:19:08 2018	(r337081)
@@ -4064,6 +4064,9 @@ int rdma_join_multicast(struct rdma_cm_id *id, struct 
 	struct cma_multicast *mc;
 	int ret;
 
+	if (!id->device)
+		return -EINVAL;
+
 	id_priv = container_of(id, struct rdma_id_private, id);
 	if (!cma_comp(id_priv, RDMA_CM_ADDR_BOUND) &&
 	    !cma_comp(id_priv, RDMA_CM_ADDR_RESOLVED))