lkml.org 
[lkml]   [2018]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 22/27] qed: Fix memory/entry leak in qed_init_sp_request()
    Date
    From: Denis Bolotin <denis.bolotin@cavium.com>

    [ Upstream commit 39477551df940ddb1339203817de04f5caaacf7a ]

    Free the allocated SPQ entry or return the acquired SPQ entry to the free
    list in error flows.

    Signed-off-by: Denis Bolotin <denis.bolotin@cavium.com>
    Signed-off-by: Michal Kalderon <michal.kalderon@cavium.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../net/ethernet/qlogic/qed/qed_sp_commands.c | 16 ++++++++++++++--
    1 file changed, 14 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c b/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c
    index d7c5965328be..b26578464469 100644
    --- a/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c
    +++ b/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c
    @@ -80,7 +80,7 @@ int qed_sp_init_request(struct qed_hwfn *p_hwfn,

    case QED_SPQ_MODE_BLOCK:
    if (!p_data->p_comp_data)
    - return -EINVAL;
    + goto err;

    p_ent->comp_cb.cookie = p_data->p_comp_data->cookie;
    break;
    @@ -95,7 +95,7 @@ int qed_sp_init_request(struct qed_hwfn *p_hwfn,
    default:
    DP_NOTICE(p_hwfn, "Unknown SPQE completion mode %d\n",
    p_ent->comp_mode);
    - return -EINVAL;
    + goto err;
    }

    DP_VERBOSE(p_hwfn, QED_MSG_SPQ,
    @@ -109,6 +109,18 @@ int qed_sp_init_request(struct qed_hwfn *p_hwfn,
    memset(&p_ent->ramrod, 0, sizeof(p_ent->ramrod));

    return 0;
    +
    +err:
    + /* qed_spq_get_entry() can either get an entry from the free_pool,
    + * or, if no entries are left, allocate a new entry and add it to
    + * the unlimited_pending list.
    + */
    + if (p_ent->queue == &p_hwfn->p_spq->unlimited_pending)
    + kfree(p_ent);
    + else
    + qed_spq_return_entry(p_hwfn, p_ent);
    +
    + return -EINVAL;
    }

    static enum tunnel_clss qed_tunn_clss_to_fw_clss(u8 type)
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-11-14 23:31    [W:4.655 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site