Skip to contentSkip to conversation

rtw89: use flexible array member in rtw89_btc_btf_tlv

PATCH In review Arnd Bergmann 4 participants 4 messages May 23, 2023 – May 25, 2023 Realtek wireless driver (rtw89)

lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 rtw89: use flexible array member in rtw89_btc_btf_tlv

From: Arnd Bergmann <[email protected]>

struct rtw89_btc_btf_tlv contains a one-byte member that is intended as a flexible array:

In function 'fortify_memcpy_chk',
inlined from '_append_tdma' at drivers/net/wireless/realtek/rtw89/coex.c:1579:3:
include/linux/fortify-string.h:583:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]

  583 |                         __write_overflow_field(p_size_field, size);
      |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Make this actually use a flexible array to let the compiler understand.

Signed-off-by Arnd Bergmann <[email protected]>
---
 drivers/net/wireless/realtek/rtw89/coex.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/coex.c +1 -1
index 3a586a971e8f..bda0e1e99a8c 100644
@@ -206,7 +206,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = {
 struct rtw89_btc_btf_tlv {
 	u8 type;
 	u8 len;
-	u8 val[1];
+	u8 val[];
 } __packed;
 
 enum btc_btf_set_report_en {
Signature · 1 line
2.39.2
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 20 lines

-----Original Message-----
From: Arnd Bergmann <[email protected]>
Sent: Tuesday, May 23, 2023 7:33 PM
To: Ping-Ke Shih <[email protected]>; Kalle Valo <[email protected]>
Cc: Arnd Bergmann <[email protected]>; DeanKu <[email protected]>; [email protected]; [email protected]
Subject: [PATCH] rtw89: use flexible array member in rtw89_btc_btf_tlv

From: Arnd Bergmann <[email protected]>

struct rtw89_btc_btf_tlv contains a one-byte member that is intended as a flexible array:

In function 'fortify_memcpy_chk',
inlined from '_append_tdma' at drivers/net/wireless/realtek/rtw89/coex.c:1579:3:
include/linux/fortify-string.h:583:25: error: call to '__write_overflow_field' declared with attribute
warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]

Quoted 6 lines
  583 |                         __write_overflow_field(p_size_field, size);
      |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Make this actually use a flexible array to let the compiler understand.

Signed-off-by Arnd Bergmann <[email protected]>
Reviewed-by Ping-Ke Shih <[email protected]>
Quoted 19 lines
---
 drivers/net/wireless/realtek/rtw89/coex.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/coex.c +1 -2
index 3a586a971e8f..bda0e1e99a8c 100644
@@ -206,7 +206,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = {
 struct rtw89_btc_btf_tlv {
        u8 type;
        u8 len;
-       u8 val[1];
+       u8 val[];
 } __packed;
 
 enum btc_btf_set_report_en {
--

2.39.2

Reviewed-by on v1 1/1
#2 lore raw
In reply to Arnd Bergmann
Quoted 8 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

struct rtw89_btc_btf_tlv contains a one-byte member that is intended as a flexible array:

In function 'fortify_memcpy_chk',
inlined from '_append_tdma' at drivers/net/wireless/realtek/rtw89/coex.c:1579:3:
include/linux/fortify-string.h:583:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]

Quoted 6 lines
   583 |                         __write_overflow_field(p_size_field, size);
       |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Make this actually use a flexible array to let the compiler understand.

Signed-off-by Arnd Bergmann <[email protected]>
Reviewed-by Gustavo A. R. Silva <[email protected]>

Thanks!
--
Gustavo

Quoted 17 lines
---
  drivers/net/wireless/realtek/rtw89/coex.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/coex.c +1 -1
index 3a586a971e8f..bda0e1e99a8c 100644
@@ -206,7 +206,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = {
  struct rtw89_btc_btf_tlv {
  	u8 type;
  	u8 len;
-	u8 val[1];
+	u8 val[];
  } __packed;
 
  enum btc_btf_set_report_en {
#3 lore raw

Re: wifi: rtw89: use flexible array member in rtw89_btc_btf_tlv

In reply to Arnd Bergmann
Quoted 8 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

struct rtw89_btc_btf_tlv contains a one-byte member that is intended as a flexible array:

In function 'fortify_memcpy_chk',
inlined from '_append_tdma' at drivers/net/wireless/realtek/rtw89/coex.c:1579:3:
include/linux/fortify-string.h:583:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]

Quoted 8 lines
  583 |                         __write_overflow_field(p_size_field, size);
      |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Make this actually use a flexible array to let the compiler understand.

Signed-off-by Arnd Bergmann <[email protected]>
Reviewed-by Ping-Ke Shih <[email protected]>
Reviewed-by Gustavo A. R. Silva <[email protected]>

Patch applied to wireless-next.git, thanks.

47e612268ea0 wifi: rtw89: use flexible array member in rtw89_btc_btf_tlv

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches