From: alexander.levin@verizon.com
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"stable@vger.kernel.org" <stable@vger.kernel.org>
Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>,
Johannes Berg <johannes.berg@intel.com>,
alexander.levin@verizon.com
Subject: [PATCH AUTOSEL for 4.9 05/33] mac80211_hwsim: Fix memory leak in hwsim_new_radio_nl()
Date: Sat, 2 Dec 2017 15:52:15 +0000 [thread overview]
Message-ID: <20171202155204.7691-5-alexander.levin@verizon.com> (raw)
In-Reply-To: <20171202155204.7691-1-alexander.levin@verizon.com>
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>
---
drivers/net/wireless/mac80211_hwsim.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index d2a28a9d3209..4b462dc21c41 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -3047,6 +3047,7 @@ static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info)
{
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];
@@ -3086,7 +3087,9 @@ static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info)
param.regd = hwsim_world_regdom_custom[idx];
}
- return mac80211_hwsim_new_radio(info, ¶m);
+ ret = mac80211_hwsim_new_radio(info, ¶m);
+ kfree(hwname);
+ return ret;
}
static int hwsim_del_radio_nl(struct sk_buff *msg, struct genl_info *info)
--
2.11.0
next prev parent reply other threads:[~2017-12-02 15:53 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-02 15:52 [PATCH AUTOSEL for 4.9 01/33] kbuild: pkg: use --transform option to prefix paths in tar alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 02/33] coccinelle: fix parallel build with CHECK=scripts/coccicheck alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 03/33] net: qmi_wwan: add Quectel BG96 2c7c:0296 alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 04/33] x86/mpx/selftests: Fix up weird arrays alexander.levin
2017-12-02 15:52 ` alexander.levin [this message]
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 06/33] gre6: use log_ecn_error module parameter in ip6_tnl_rcv() alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 07/33] route: also update fnhe_genid when updating a route cache alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 08/33] route: update fnhe_expires for redirect when the fnhe exists alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 09/33] drivers/rapidio/devices/rio_mport_cdev.c: fix resource leak in error handling path in 'rio_dma_transfer()' alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 10/33] lib/genalloc.c: make the avail variable an atomic_long_t alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 11/33] dynamic-debug-howto: fix optional/omitted ending line number to be LARGE instead of 0 alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 13/33] sunrpc: Fix rpc_task_begin trace point alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 12/33] NFS: Fix a typo in nfs_rename() alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 14/33] xfs: fix forgotten rcu read unlock when skipping inode reclaim alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 15/33] dt-bindings: usb: fix reg-property port-number range alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 16/33] block: wake up all tasks blocked in get_request() alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 17/33] sparc64/mm: set fields in deferred pages alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 18/33] zsmalloc: calling zs_map_object() from irq is a bug alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 20/33] sctp: use the right sk after waking up from wait_buf sleep alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 19/33] sctp: do not free asoc when it is already dead in sctp_sendmsg alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 21/33] bpf: fix lockdep splat alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 24/33] jump_label: Invoke jump_label_test() via early_initcall() alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 23/33] atm: horizon: Fix irq release error alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 22/33] clk: uniphier: fix DAPLL2 clock rate of Pro5 alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 25/33] xfrm: Copy policy family in clone_policy alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 26/33] IB/mlx4: Increase maximal message size under UD QP alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 28/33] afs: Connect up the CB.ProbeUuid alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 27/33] IB/mlx5: Assign send CQ and recv CQ of UMR QP alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 29/33] kbuild: do not call cc-option before KBUILD_CFLAGS initialization alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 30/33] ipvlan: fix ipv6 outbound device alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 32/33] md: free unused memory after bitmap resize alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 31/33] audit: ensure that 'audit=1' actually enables audit for PID 1 alexander.levin
2017-12-02 15:52 ` [PATCH AUTOSEL for 4.9 33/33] RDMA/cxgb4: Annotate r2 and stag as __be32 alexander.levin
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=20171202155204.7691-5-alexander.levin@verizon.com \
--to=alexander.levin@verizon.com \
--cc=ben.hutchings@codethink.co.uk \
--cc=johannes.berg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/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
all inboxes | Powered by JetHome®