lkml.org 
[lkml]   [2018]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 25/87] IB/mlx4: Test port number before querying type.
    Date
    From: Tarick Bedeir <tarick@google.com>

    [ Upstream commit f1228867adaf8890826f2b59e4caddb1c5cc2df7 ]

    rdma_ah_find_type() can reach into ib_device->port_immutable with a
    potentially out-of-bounds port number, so check that the port number is
    valid first.

    Fixes: 44c58487d51a ("IB/core: Define 'ib' and 'roce' rdma_ah_attr types")
    Signed-off-by: Tarick Bedeir <tarick@google.com>
    Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
    Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/infiniband/hw/mlx4/qp.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
    index 9354fec8efe7..e10c3d915e38 100644
    --- a/drivers/infiniband/hw/mlx4/qp.c
    +++ b/drivers/infiniband/hw/mlx4/qp.c
    @@ -4014,9 +4014,9 @@ static void to_rdma_ah_attr(struct mlx4_ib_dev *ibdev,
    u8 port_num = path->sched_queue & 0x40 ? 2 : 1;

    memset(ah_attr, 0, sizeof(*ah_attr));
    - ah_attr->type = rdma_ah_find_type(&ibdev->ib_dev, port_num);
    if (port_num == 0 || port_num > dev->caps.num_ports)
    return;
    + ah_attr->type = rdma_ah_find_type(&ibdev->ib_dev, port_num);

    if (ah_attr->type == RDMA_AH_ATTR_TYPE_ROCE)
    rdma_ah_set_sl(ah_attr, ((path->sched_queue >> 3) & 0x7) |
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-09-17 05:04    [W:4.016 / U:0.252 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site