package/kernel/mac80211/patches/brcm/108-v5.4-brcmfmac-replace-strncpy-by-strscpy.patch

   1 From 5f42b382ead278c1f6c3854765c97eb20491aa2a Mon Sep 17 00:00:00 2001
   2 From: Xulin Sun <xulin.sun@windriver.com>
   3 Date: Fri, 23 Aug 2019 15:47:08 +0800
   4 Subject: [PATCH] brcmfmac: replace strncpy() by strscpy()
   5
   6 The strncpy() may truncate the copied string,
   7 replace it by the safer strscpy().
   8
   9 To avoid below compile warning with gcc 8.2:
  10
  11 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:In function 'brcmf_vndr_ie':
  12 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:4227:2:
  13 warning: 'strncpy' output truncated before terminating nul copying 3 bytes from a string of the same length [-Wstringop-truncation]
  14   strncpy(iebuf, add_del_cmd, VNDR_IE_CMD_LEN - 1);
  15   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  16
  17 Signed-off-by: Xulin Sun <xulin.sun@windriver.com>
  18 Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  19 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  20 ---
  21  drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 4 +---
  22  1 file changed, 1 insertion(+), 3 deletions(-)
  23
  24 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
  25 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
  26 @@ -4244,9 +4244,7 @@ next:
  27  static u32
  28  brcmf_vndr_ie(u8 *iebuf, s32 pktflag, u8 *ie_ptr, u32 ie_len, s8 *add_del_cmd)
  29  {
  30 -
  31 -       strncpy(iebuf, add_del_cmd, VNDR_IE_CMD_LEN - 1);
  32 -       iebuf[VNDR_IE_CMD_LEN - 1] = '\0';
  33 +       strscpy(iebuf, add_del_cmd, VNDR_IE_CMD_LEN);
  34
  35         put_unaligned_le32(1, &iebuf[VNDR_IE_COUNT_OFFSET]);
  36