lkml.org 
[lkml]   [2020]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 386/671] net: hns3: fix a memory leak issue for hclge_map_unmap_ring_to_vf_vector
    Date
    From: Huazhong Tan <tanhuazhong@huawei.com>

    [ Upstream commit 49f971bd308571fe466687227130a7082b662d0e ]

    When hclge_bind_ring_with_vector() fails,
    hclge_map_unmap_ring_to_vf_vector() returns the error
    directly, so nobody will free the memory allocated by
    hclge_get_ring_chain_from_mbx().

    So hclge_free_vector_ring_chain() should be called no matter
    hclge_bind_ring_with_vector() fails or not.

    Fixes: 84e095d64ed9 ("net: hns3: Change PF to add ring-vect binding & resetQ to mailbox")
    Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
    Signed-off-by: Peng Li <lipeng321@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
    index e08e82020402..997ca79ed892 100644
    --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
    +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
    @@ -181,12 +181,10 @@ static int hclge_map_unmap_ring_to_vf_vector(struct hclge_vport *vport, bool en,
    return ret;

    ret = hclge_bind_ring_with_vector(vport, vector_id, en, &ring_chain);
    - if (ret)
    - return ret;

    hclge_free_vector_ring_chain(&ring_chain);

    - return 0;
    + return ret;
    }

    static int hclge_set_vf_promisc_mode(struct hclge_vport *vport,
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-01-16 18:08    [W:4.810 / U:0.728 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site