diff options
| author | David S. Miller <davem@davemloft.net> | 2019-04-09 10:57:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-09 10:57:10 -0700 |
| commit | c03fd0171ba6c8807ff5ba7c797896c84e18f3bc (patch) | |
| tree | b79899c124221db66049df5d3ccc8fb5eb75eb72 /net/wireless/scan.c | |
| parent | 869e3305f23dfeacdaa234717c92ccb237815d90 (diff) | |
| parent | 78ad2341521d5ea96cb936244ed4c4c4ef9ec13b (diff) | |
Merge tag 'mac80211-for-davem-2019-04-09' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Various fixes:
* iTXQ fixes from Felix
* tracing fix - increase message length
* fix SW_CRYPTO_CONTROL enforcement
* WMM rule handling for regdomain intersection
* max_interfaces in hwsim - reported by syzbot
* clear private data in some more commands
* a clang compiler warning fix
I added a patch with two new (unused) macros for
rate-limited printing to simplify getting the users
into the tree.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/scan.c')
| -rw-r--r-- | net/wireless/scan.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 287518c6caa4..04d888628f29 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -190,10 +190,9 @@ static size_t cfg80211_gen_new_ie(const u8 *ie, size_t ielen, /* copy subelement as we need to change its content to * mark an ie after it is processed. */ - sub_copy = kmalloc(subie_len, gfp); + sub_copy = kmemdup(subelement, subie_len, gfp); if (!sub_copy) return 0; - memcpy(sub_copy, subelement, subie_len); pos = &new_ie[0]; |