Skip to content

Commit

Permalink
RDMA/cma: Check existence of netdevice during port validation
Browse files Browse the repository at this point in the history
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: abae1b7 ("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>
  • Loading branch information
Parav Pandit authored and Jason Gunthorpe committed Jan 22, 2018
1 parent 10bea9c commit 00db63c
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/infiniband/core/cma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 00db63c

Please sign in to comment.