RDMA/cma: Verify that source and dest sa_family are the same

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 524cf986d9fa1ca11cb5f33adcc0b059a53df4c5..9f6e719cf6207d1842a4db6567ec228dd87bb018 100644 (file)
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -1849,14 +1849,9 @@ static int cma_resolve_iboe_route(struct rdma_id_private *id_priv)
        struct rdma_addr *addr = &route->addr;
        struct cma_work *work;
        int ret;
-       struct sockaddr_in *src_addr = (struct sockaddr_in *)&route->addr.src_addr;
-       struct sockaddr_in *dst_addr = (struct sockaddr_in *)&route->addr.dst_addr;
        struct net_device *ndev = NULL;
        u16 vid;
 
-       if (src_addr->sin_family != dst_addr->sin_family)
-               return -EINVAL;
-
        work = kzalloc(sizeof *work, GFP_KERNEL);
        if (!work)
                return -ENOMEM;
@@ -2132,6 +2127,9 @@ int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
                        return ret;
        }
 
+       if (cma_family(id_priv) != dst_addr->sa_family)
+               return -EINVAL;
+
        if (!cma_comp_exch(id_priv, RDMA_CM_ADDR_BOUND, RDMA_CM_ADDR_QUERY))
                return -EINVAL;