]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
RDMA/cma: Check existence of netdevice during port validation
authorParav Pandit <parav@mellanox.com>
Tue, 9 Jan 2018 13:58:54 +0000 (15:58 +0200)
committerJason Gunthorpe <jgg@mellanox.com>
Mon, 22 Jan 2018 18:39:50 +0000 (11:39 -0700)
If valid netdevice is not found for RoCE, GID table should not be
searched with NULL netdevice.

Doing so causes the search routines to ignore the netdev argument and may
match the wrong GID table entry if the netdev is deleted.

Fixes: abae1b71dd37 ("IB/cma: cma_validate_port should verify the port and netdevice")
Signed-off-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
drivers/infiniband/core/cma.c

index 66590a4c612dc3f3df7f7f560ca1dec45dcbcf4f..61a2f3ead99b1a26867e51eb675549ed7b0c5cf4 100644 (file)
@@ -624,11 +624,13 @@ static inline int cma_validate_port(struct ib_device *device, u8 port,
        if ((dev_type != ARPHRD_INFINIBAND) && rdma_protocol_ib(device, port))
                return ret;
 
-       if (dev_type == ARPHRD_ETHER && rdma_protocol_roce(device, port))
+       if (dev_type == ARPHRD_ETHER && rdma_protocol_roce(device, port)) {
                ndev = dev_get_by_index(&init_net, bound_if_index);
-       else
+               if (!ndev)
+                       return ret;
+       } else {
                gid_type = IB_GID_TYPE_IB;
-
+       }
 
        ret = ib_find_cached_gid_by_port(device, gid, gid_type, port,
                                         ndev, NULL);