From: Ben Hutchings <ben.hutchings@codethink.co.uk>
To: Wei Yongjun <weiyongjun1@huawei.com>,
Johannes Berg <johannes@sipsolutions.net>,
Kalle Valo <kvalo@codeaurora.org>
Cc: linux-wireless@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH net-next] mac80211_hwsim: fix possible memory leak in hwsim_new_radio_nl()
Date: Fri, 19 Jan 2018 00:38:56 +0000 [thread overview]
Message-ID: <1516322336.3417.3.camel@codethink.co.uk> (raw)
In-Reply-To: <1516242214-51095-1-git-send-email-weiyongjun1@huawei.com>
On Thu, 2018-01-18 at 02:23 +0000, Wei Yongjun wrote:
> 'hwname' is malloced in hwsim_new_radio_nl() and should be freed
> before leaving from the error handling cases, otherwise it will cause
> memory leak.
>
> Fixes: ff4dd73dd2b4 ("mac80211_hwsim: check HWSIM_ATTR_RADIO_NAME length")
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Not sure how I missed this case.
Ben.
> ---
> drivers/net/wireless/mac80211_hwsim.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
> index e542555..34052c1 100644
> --- a/drivers/net/wireless/mac80211_hwsim.c
> +++ b/drivers/net/wireless/mac80211_hwsim.c
> @@ -3155,8 +3155,10 @@ static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info)
> if (info->attrs[HWSIM_ATTR_REG_CUSTOM_REG]) {
> u32 idx = nla_get_u32(info->attrs[HWSIM_ATTR_REG_CUSTOM_REG]);
>
> - if (idx >= ARRAY_SIZE(hwsim_world_regdom_custom))
> + if (idx >= ARRAY_SIZE(hwsim_world_regdom_custom)) {
> + kfree(hwname);
> return -EINVAL;
> + }
> param.regd = hwsim_world_regdom_custom[idx];
> }
>
>
--
Ben Hutchings
Software Developer, Codethink Ltd.
prev parent reply other threads:[~2018-01-19 0:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-18 2:23 [PATCH net-next] mac80211_hwsim: fix possible memory leak in hwsim_new_radio_nl() Wei Yongjun
2018-01-19 0:38 ` Ben Hutchings [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1516322336.3417.3.camel@codethink.co.uk \
--to=ben.hutchings@codethink.co.uk \
--cc=johannes@sipsolutions.net \
--cc=kernel-janitors@vger.kernel.org \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
--cc=weiyongjun1@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).