lkml.org 
[lkml]   [2017]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 074/105] mac80211_hwsim: Fix memory leak in hwsim_new_radio_nl()
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Ben Hutchings <ben.hutchings@codethink.co.uk>


    [ Upstream commit 67bd52386125ce1159c0581cbcd2740addf33cd4 ]

    hwsim_new_radio_nl() now copies the name attribute in order to add a
    null-terminator. mac80211_hwsim_new_radio() (indirectly) copies it
    again into the net_device structure, so the first copy is not used or
    freed later. Free the first copy before returning.

    Fixes: ff4dd73dd2b4 ("mac80211_hwsim: check HWSIM_ATTR_RADIO_NAME length")
    Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/wireless/mac80211_hwsim.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/drivers/net/wireless/mac80211_hwsim.c
    +++ b/drivers/net/wireless/mac80211_hwsim.c
    @@ -2885,6 +2885,7 @@ static int hwsim_new_radio_nl(struct sk_
    {
    struct hwsim_new_radio_params param = { 0 };
    const char *hwname = NULL;
    + int ret;

    param.reg_strict = info->attrs[HWSIM_ATTR_REG_STRICT_REG];
    param.p2p_device = info->attrs[HWSIM_ATTR_SUPPORT_P2P_DEVICE];
    @@ -2924,7 +2925,9 @@ static int hwsim_new_radio_nl(struct sk_
    param.regd = hwsim_world_regdom_custom[idx];
    }

    - return mac80211_hwsim_new_radio(info, &param);
    + ret = mac80211_hwsim_new_radio(info, &param);
    + kfree(hwname);
    + return ret;
    }

    static int hwsim_del_radio_nl(struct sk_buff *msg, struct genl_info *info)

    \
     
     \ /
      Last update: 2017-12-15 10:52    [W:3.543 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site