| Message ID | 20190823074708.20081-1-xulin.sun@windriver.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5f42b382ead278c1f6c3854765c97eb20491aa2a |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | brcmfmac: replace strncpy() by strscpy() | expand |
On 8/23/2019 9:47 AM, Xulin Sun wrote: > The strncpy() may truncate the copied string, > replace it by the safer strscpy(). > > To avoid below compile warning with gcc 8.2: > > drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:In function 'brcmf_vndr_ie': > drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:4227:2: > warning: 'strncpy' output truncated before terminating nul copying 3 bytes from a string of the same length [-Wstringop-truncation] > strncpy(iebuf, add_del_cmd, VNDR_IE_CMD_LEN - 1); > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com> > Signed-off-by: Xulin Sun <xulin.sun@windriver.com> > --- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-)
Xulin Sun <xulin.sun@windriver.com> wrote: > The strncpy() may truncate the copied string, > replace it by the safer strscpy(). > > To avoid below compile warning with gcc 8.2: > > drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:In function 'brcmf_vndr_ie': > drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:4227:2: > warning: 'strncpy' output truncated before terminating nul copying 3 bytes from a string of the same length [-Wstringop-truncation] > strncpy(iebuf, add_del_cmd, VNDR_IE_CMD_LEN - 1); > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > Signed-off-by: Xulin Sun <xulin.sun@windriver.com> > Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com> Patch applied to wireless-drivers-next.git, thanks. 5f42b382ead2 brcmfmac: replace strncpy() by strscpy()
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index b6d0df354b36..7ad60374fa96 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -4226,9 +4226,7 @@ brcmf_parse_vndr_ies(const u8 *vndr_ie_buf, u32 vndr_ie_len, static u32 brcmf_vndr_ie(u8 *iebuf, s32 pktflag, u8 *ie_ptr, u32 ie_len, s8 *add_del_cmd) { - - strncpy(iebuf, add_del_cmd, VNDR_IE_CMD_LEN - 1); - iebuf[VNDR_IE_CMD_LEN - 1] = '\0'; + strscpy(iebuf, add_del_cmd, VNDR_IE_CMD_LEN); put_unaligned_le32(1, &iebuf[VNDR_IE_COUNT_OFFSET]);
The strncpy() may truncate the copied string, replace it by the safer strscpy(). To avoid below compile warning with gcc 8.2: drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:In function 'brcmf_vndr_ie': drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:4227:2: warning: 'strncpy' output truncated before terminating nul copying 3 bytes from a string of the same length [-Wstringop-truncation] strncpy(iebuf, add_del_cmd, VNDR_IE_CMD_LEN - 1); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Xulin Sun <xulin.sun@windriver.com> --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)