lkml.org 
[lkml]   [2017]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 81/96] ath10k: fix potential memory leak in ath10k_wmi_tlv_op_pull_fw_stats()
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Christian Lamparter <chunkeey@googlemail.com>


    [ Upstream commit 097e46d2ae90265d1afe141ba6208ba598b79e01 ]

    ath10k_wmi_tlv_op_pull_fw_stats() uses tb = ath10k_wmi_tlv_parse_alloc(...)
    function, which allocates memory. If any of the three error-paths are
    taken, this tb needs to be freed.

    Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
    Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/wireless/ath/ath10k/wmi-tlv.c | 12 +++++++++---
    1 file changed, 9 insertions(+), 3 deletions(-)

    --- a/drivers/net/wireless/ath/ath10k/wmi-tlv.c
    +++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
    @@ -1105,8 +1105,10 @@ static int ath10k_wmi_tlv_op_pull_fw_sta
    struct ath10k_fw_stats_pdev *dst;

    src = data;
    - if (data_len < sizeof(*src))
    + if (data_len < sizeof(*src)) {
    + kfree(tb);
    return -EPROTO;
    + }

    data += sizeof(*src);
    data_len -= sizeof(*src);
    @@ -1126,8 +1128,10 @@ static int ath10k_wmi_tlv_op_pull_fw_sta
    struct ath10k_fw_stats_vdev *dst;

    src = data;
    - if (data_len < sizeof(*src))
    + if (data_len < sizeof(*src)) {
    + kfree(tb);
    return -EPROTO;
    + }

    data += sizeof(*src);
    data_len -= sizeof(*src);
    @@ -1145,8 +1149,10 @@ static int ath10k_wmi_tlv_op_pull_fw_sta
    struct ath10k_fw_stats_peer *dst;

    src = data;
    - if (data_len < sizeof(*src))
    + if (data_len < sizeof(*src)) {
    + kfree(tb);
    return -EPROTO;
    + }

    data += sizeof(*src);
    data_len -= sizeof(*src);

    \
     
     \ /
      Last update: 2017-11-28 13:13    [W:4.064 / U:0.492 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site