| Message ID | 20210511070257.7843-1-ihuguet@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c0277e25d28fc534c09e140c19d5b85f9e7f86fd |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | BRCM80211: improve readability on addresses copy | expand |
On Tue, May 11, 2021 at 9:04 AM Íñigo Huguet <ihuguet@redhat.com> wrote: > > A static analyzer identified as a potential bug the copy of > 12 bytes from a 6 bytes array to a 6 bytes array. Both > arrays are 6 bytes addresses. > > Although not being a real bug, it is not immediately clear > why is done this way: next 6 bytes address, contiguous to > the first one, must also be copied to next contiguous 6 bytes > address of the destination. > > Copying each one separately will make both static analyzers > and reviewers happier. > > Signed-off-by: Íñigo Huguet <ihuguet@redhat.com> > --- > drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c > index 763e0ec583d7..26de1bd7fee9 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c > @@ -6607,7 +6607,8 @@ brcms_c_d11hdrs_mac80211(struct brcms_c_info *wlc, struct ieee80211_hw *hw, > rts->frame_control = cpu_to_le16(IEEE80211_FTYPE_CTL | > IEEE80211_STYPE_RTS); > > - memcpy(&rts->ra, &h->addr1, 2 * ETH_ALEN); > + memcpy(&rts->ra, &h->addr1, ETH_ALEN); > + memcpy(&rts->ta, &h->addr2, ETH_ALEN); > } > > /* mainrate > -- > 2.31.1 > Hello, About 3 weeks ago I sent this patch, just with a small style change proposal. Any feedback would be appreciated. Thanks!
Íñigo Huguet <ihuguet@redhat.com> wrote: > A static analyzer identified as a potential bug the copy of > 12 bytes from a 6 bytes array to a 6 bytes array. Both > arrays are 6 bytes addresses. > > Although not being a real bug, it is not immediately clear > why is done this way: next 6 bytes address, contiguous to > the first one, must also be copied to next contiguous 6 bytes > address of the destination. > > Copying each one separately will make both static analyzers > and reviewers happier. > > Signed-off-by: Íñigo Huguet <ihuguet@redhat.com> Patch applied to wireless-drivers-next.git, thanks. c0277e25d28f brcmsmac: improve readability on addresses copy
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c index 763e0ec583d7..26de1bd7fee9 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c @@ -6607,7 +6607,8 @@ brcms_c_d11hdrs_mac80211(struct brcms_c_info *wlc, struct ieee80211_hw *hw, rts->frame_control = cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_RTS); - memcpy(&rts->ra, &h->addr1, 2 * ETH_ALEN); + memcpy(&rts->ra, &h->addr1, ETH_ALEN); + memcpy(&rts->ta, &h->addr2, ETH_ALEN); } /* mainrate
A static analyzer identified as a potential bug the copy of 12 bytes from a 6 bytes array to a 6 bytes array. Both arrays are 6 bytes addresses. Although not being a real bug, it is not immediately clear why is done this way: next 6 bytes address, contiguous to the first one, must also be copied to next contiguous 6 bytes address of the destination. Copying each one separately will make both static analyzers and reviewers happier. Signed-off-by: Íñigo Huguet <ihuguet@redhat.com> --- drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)