• Kees Cook's avatar
    wifi: brcmfmac: Adjust n_channels usage for __counted_by · 5bdda004
    Kees Cook authored
    After commit e3eac9f3 ("wifi: cfg80211: Annotate struct
    cfg80211_scan_request with __counted_by"), the compiler may enforce
    dynamic array indexing of req->channels to stay below n_channels. As a
    result, n_channels needs to be increased _before_ accessing the newly
    added array index. Increment it first, then use "i" for the prior index.
    Solves this warning in the coming GCC that has __counted_by support:
    
    ../drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c: In function 'brcmf_internal_escan_add_info':
    ../drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:3783:46: warning: operation on 'req->
    n_channels' may be undefined [-Wsequence-point]
     3783 |                 req->channels[req->n_channels++] = chan;
          |                               ~~~~~~~~~~~~~~~^~
    
    Fixes: e3eac9f3 ("wifi: cfg80211: Annotate struct cfg80211_scan_request with __counted_by")
    Cc: Arend van Spriel <aspriel@gmail.com>
    Cc: Franky Lin <franky.lin@broadcom.com>
    Cc: Hante Meuleman <hante.meuleman@broadcom.com>
    Cc: Kalle Valo <kvalo@kernel.org>
    Cc: Chi-hsien Lin <chi-hsien.lin@infineon.com>
    Cc: Ian Lin <ian.lin@infineon.com>
    Cc: Johannes Berg <johannes.berg@intel.com>
    Cc: Wright Feng <wright.feng@cypress.com>
    Cc: Hector Martin <marcan@marcan.st>
    Cc: linux-wireless@vger.kernel.org
    Cc: brcm80211-dev-list.pdl@broadcom.com
    Signed-off-by: default avatarKees Cook <keescook@chromium.org>
    Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
    Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
    Reviewed-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
    Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
    Link: https://msgid.link/20240126223150.work.548-kees@kernel.org
    5bdda004
cfg80211.c 228 KB