diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-21 23:20:08 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-21 23:20:08 +0200 |
| commit | 3b8a1f45e1b3886593a7cbb0aca09d4d0a9e23df (patch) | |
| tree | e9f4ada62ee0d88c7c389cbf66bf2f7ec897c680 /net/wireless/scan.c | |
| parent | tty:serial_core: Spelling mistake (diff) | |
| parent | Linux 5.1-rc6 (diff) | |
| download | linux-3b8a1f45e1b3886593a7cbb0aca09d4d0a9e23df.tar.xz linux-3b8a1f45e1b3886593a7cbb0aca09d4d0a9e23df.zip | |
Merge 5.1-rc6 into tty-next
We want the serial/tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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]; |