Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ebaefbdaf552f9e159ea08f54afb6c80e20b2641

Authored by Arnd Bergmann
Committed by Greg Kroah-Hartman
1 parent 2f9eed6e37
Exists in smarc_8mm_imx_4.14.98_2.0.0_ga and in 6 other branches smarc-imx6_4.14.98_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.14.78_1.0.0_ga

cfg80211: fix cfg80211_beacon_dup 

commit bee92d06157fc39d5d7836a061c7d41289a55797 upstream.

gcc-8 warns about some obviously incorrect code:

net/mac80211/cfg.c: In function 'cfg80211_beacon_dup':
net/mac80211/cfg.c:2896:3: error: 'memcpy' source argument is the same as destination [-Werror=restrict]

From the context, I conclude that we want to copy from beacon into
new_beacon, as we do in the rest of the function.

Cc: stable@vger.kernel.org
Fixes: 73da7d5bab79 ("mac80211: add channel switch command and beacon callbacks")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -2863,7 +2863,7 @@
2863 2863 }
2864 2864 if (beacon->probe_resp_len) {
2865 2865 new_beacon->probe_resp_len = beacon->probe_resp_len;
2866   - beacon->probe_resp = pos;
  2866 + new_beacon->probe_resp = pos;
2867 2867 memcpy(pos, beacon->probe_resp, beacon->probe_resp_len);
2868 2868 pos += beacon->probe_resp_len;
2869 2869 }