lkml.org 
[lkml]   [2018]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 263/410] cfg80211: fix cfg80211_beacon_dup
    3.16.57-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Arnd Bergmann <arnd@arndb.de>

    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]

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

    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: Ben Hutchings <ben@decadent.org.uk>
    ---
    net/mac80211/cfg.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/net/mac80211/cfg.c
    +++ b/net/mac80211/cfg.c
    @@ -3054,7 +3054,7 @@ cfg80211_beacon_dup(struct cfg80211_beac
    }
    if (beacon->probe_resp_len) {
    new_beacon->probe_resp_len = beacon->probe_resp_len;
    - beacon->probe_resp = pos;
    + new_beacon->probe_resp = pos;
    memcpy(pos, beacon->probe_resp, beacon->probe_resp_len);
    pos += beacon->probe_resp_len;
    }
    \
     
     \ /
      Last update: 2018-06-07 17:51    [W:4.525 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site