Skip to contentSkip to conversation

brcmfmac: Replace zero-length arrays with DECLARE_FLEX_ARRAY() helper

PATCH New Atul Raut 5 participants 9 messages Aug 3, 2023 – Jan 27, 2024 Broadcom BRCM80211 IEEE802.11 wireless drivers

lore
Share & tools
lore

Atul Raut

author
#0 lore raw

PATCH 1/1 brcmfmac: Replace zero-length arrays with DECLARE_FLEX_ARRAY() helper

Replacing zero-length arrays with C99 flexible-array members because they are deprecated.
Use the new DECLARE_FLEX_ARRAY() auxiliary macro instead of defining a zero-length array.

This fixes warnings such as:
./drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:119:6-9: WARNING use flexible-array member instead (https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-and-one-element-arrays)

---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +1 -1
index de8a2e27f49c..983946b146b3 100644
@@ -116,7 +116,7 @@ struct brcmf_dump_survey {
 struct cca_stats_n_flags {
 	u32 msrmnt_time; /* Time for Measurement (msec) */
 	u32 msrmnt_done; /* flag set when measurement complete */
-	char buf[1];
+	DECLARE_FLEX_ARRAY(char, buf);
 };
 
 struct cca_msrmnt_query {
Signature · 6 lines
2.34.1

_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
author
#1 lore raw

PATCH v2 1/1 brcmfmac: replace one-element array with flexible-array member

One-element arrays are obsolete, and flexible array members have taken their place. So, in struct cca_stats_n_flags, replace the one-element array with a flexible-array member.

This fixes warnings such as:
./drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:119:6-9: WARNING use flexible-array member instead (https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-and-one-element-arrays)

---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +1 -1
index de8a2e27f49c..fff32e54833d 100644
@@ -116,7 +116,7 @@ struct brcmf_dump_survey {
 struct cca_stats_n_flags {
 	u32 msrmnt_time; /* Time for Measurement (msec) */
 	u32 msrmnt_done; /* flag set when measurement complete */
-	char buf[1];
+	char buf[];
 };
 
 struct cca_msrmnt_query {
Signature · 6 lines
2.34.1

_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
#2 lore raw

Re: [PATCH v2] brcmfmac: replace one-element array with flexible-array member

Quoted 11 lines · Atul Raut

One-element arrays are obsolete, and flexible array members have taken their place. So, in struct cca_stats_n_flags, replace the one-element array with a flexible-array member.

This fixes warnings such as:
./drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:119:6-9:
WARNING use flexible-array member instead
(https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-and-one-element-arrays)

I have now three patches from you in queue:

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

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

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

v1 submitted twice and v2 without any change log. Please read the documentation from our wiki link below how to submit patches.

Also I would like to have a review from someone else before I consider taking this.

Signature · 7 lines
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
#3 lore raw

Re: [PATCH v2] brcmfmac: replace one-element array with flexible-array member

In reply to Atul Raut
Quoted 9 lines · Atul Raut

One-element arrays are obsolete, and flexible array members have taken their place. So, in struct cca_stats_n_flags, replace the one-element array with a flexible-array member.

This fixes warnings such as:
./drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:119:6-9: WARNING use flexible-array member instead (https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-and-one-element-arrays)

Arend, what do you think? Link to the patch after "--" line.

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

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
maintainer
#4 lore raw

Re: [PATCH v2] brcmfmac: replace one-element array with flexible-array member

In reply to Atul Raut

+ Kees

Quoted 7 lines · Atul Raut

One-element arrays are obsolete, and flexible array members have taken their place. So, in struct cca_stats_n_flags, replace the one-element array with a flexible-array member.

This fixes warnings such as:
./drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:119:6-9: WARNING use flexible-array member instead (https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-and-one-element-arrays)

I think this correct, but maybe Kees can give definitive answer here.

Quoted 18 lines
---
  drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +1 -1
index de8a2e27f49c..fff32e54833d 100644
@@ -116,7 +116,7 @@ struct brcmf_dump_survey {
  struct cca_stats_n_flags {
  	u32 msrmnt_time; /* Time for Measurement (msec) */
  	u32 msrmnt_done; /* flag set when measurement complete */
-	char buf[1];
+	char buf[];
  };
 
  struct cca_msrmnt_query {
Reviewed-by
#5 lore raw

Re: [PATCH v2] brcmfmac: replace one-element array with flexible-array member

Quoted 18 lines · Arend van Spriel

+ Kees

Quoted 7 lines · Atul Raut

One-element arrays are obsolete, and flexible array members have taken their place. So, in struct cca_stats_n_flags, replace the one-element array with a flexible-array member.

This fixes warnings such as:
./drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:119:6-9: WARNING use flexible-array member instead (https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-and-one-element-arrays)

I think this correct, but maybe Kees can give definitive answer here.

Quoted 5 lines
---
  drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 12 lines

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c struct brcmf_dump_survey { · line 121

Quoted 12 lines
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +1 -1
index de8a2e27f49c..fff32e54833d 100644
@@ -116,7 +116,7 @@ struct brcmf_dump_survey {
  struct cca_stats_n_flags {
  	u32 msrmnt_time; /* Time for Measurement (msec) */
  	u32 msrmnt_done; /* flag set when measurement complete */
-	char buf[1];
+	char buf[];
  };
  struct cca_msrmnt_query {

Normally a [1] -> [] conversion needs some details in the commit log about why this is safe (since it runs the risk of changing sizeof(struct cca_stats_n_flags). In this case, there's only a single user of the struct, and nothing about its use depends on its size:

#define BRCMF_DCMD_MEDLEN 1536
...

        struct cca_stats_n_flags *results;
        char *buf;
	...
        buf = kzalloc(sizeof(char) * BRCMF_DCMD_MEDLEN, GFP_KERNEL);
	...
        results = (struct cca_stats_n_flags *)(buf);
	...
                brcmf_parse_dump_obss(results->buf, survey);

So, the allocation size is big enough for the struct, and nothing depends on the struct size.

Signature · 1 line
Kees Cook
maintainer
#6 lore raw

Re: [PATCH v2] brcmfmac: replace one-element array with flexible-array member

Quoted 48 lines · Kees Cook
Quoted 18 lines · Arend van Spriel

+ Kees

Quoted 7 lines · Atul Raut

One-element arrays are obsolete, and flexible
array members have taken their place. So, in
struct cca_stats_n_flags, replace the one-element
array with a flexible-array member.

This fixes warnings such as:
./drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:119:6-9: WARNING use flexible-array member instead (https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-and-one-element-arrays)

I think this correct, but maybe Kees can give definitive answer here.

Quoted 5 lines

---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 12 lines
Quoted 6 lines
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +0 -0
index de8a2e27f49c..fff32e54833d 100644
@@ -116,7 +116,7 @@ struct brcmf_dump_survey {
 struct cca_stats_n_flags {
Quoted 6 lines

u32 msrmnt_time; /* Time for Measurement (msec) */ u32 msrmnt_done; /* flag set when measurement complete */
- char buf[1];
+ char buf[];
};
struct cca_msrmnt_query {

Normally a [1] -> [] conversion needs some details in the commit log about why this is safe (since it runs the risk of changing sizeof(struct cca_stats_n_flags). In this case, there's only a single user of the struct, and nothing about its use depends on its size:

#define BRCMF_DCMD_MEDLEN 1536
...

       struct cca_stats_n_flags *results;
       char *buf;
...
       buf = kzalloc(sizeof(char) * BRCMF_DCMD_MEDLEN, GFP_KERNEL);
...
       results = (struct cca_stats_n_flags *)(buf);
...
               brcmf_parse_dump_obss(results->buf, survey);
Quoted 4 lines

So, the allocation size is big enough for the struct, and nothing depends on the struct size.

Thanks for the confirmation.

Regards,
Arend

Quoted 2 lines

--
Kees Cook

#7 lore raw

Re: [PATCH v2] brcmfmac: replace one-element array with flexible-array member

In reply to Kees Cook
Quoted 49 lines · Kees Cook
Quoted 18 lines · Arend van Spriel

+ Kees

Quoted 7 lines · Atul Raut

One-element arrays are obsolete, and flexible array members have taken their place. So, in struct cca_stats_n_flags, replace the one-element array with a flexible-array member.

This fixes warnings such as:
./drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:119:6-9: WARNING use flexible-array member instead (https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-and-one-element-arrays)

I think this correct, but maybe Kees can give definitive answer here.

Quoted 5 lines
---
  drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 12 lines

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c struct brcmf_dump_survey { · line 121

Quoted 12 lines
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +1 -1
index de8a2e27f49c..fff32e54833d 100644
@@ -116,7 +116,7 @@ struct brcmf_dump_survey {
  struct cca_stats_n_flags {
    u32 msrmnt_time; /* Time for Measurement (msec) */
    u32 msrmnt_done; /* flag set when measurement complete */
-   char buf[1];
+   char buf[];
  };
  struct cca_msrmnt_query {

Normally a [1] -> [] conversion needs some details in the commit log about why this is safe (since it runs the risk of changing sizeof(struct cca_stats_n_flags). In this case, there's only a single user of the struct, and nothing about its use depends on its size:

#define BRCMF_DCMD_MEDLEN 1536
...

        struct cca_stats_n_flags *results;
        char *buf;
        ...
        buf = kzalloc(sizeof(char) * BRCMF_DCMD_MEDLEN, GFP_KERNEL);
        ...
        results = (struct cca_stats_n_flags *)(buf);
        ...
                brcmf_parse_dump_obss(results->buf, survey);
Quoted 5 lines

So, the allocation size is big enough for the struct, and nothing depends on the struct size.

As the linux-kernel-mentees mailing list is in CC, I assume that Atul is a linux-kernel mentee. In that case, it is certainly reasonable and at least of educational value for Atul to take Kees' explanation and add this to the patch's commit message in his own words. Then, with that, submit a PATCH v3.

Lukas

author
#8 lore raw

Re: [PATCH v2] brcmfmac: replace one-element array with flexible-array member

Thank You Kees,

Hello Lukas, Arend & Kalle,

Sorry for not getting back to you sooner, am out of county &

hence unable to push the patch right away.

Will share once back, apologize for inconvenience caused.

-Atul

Quoted 60 lines · Lukas Bulwahn
Quoted 46 lines · Kees Cook
Quoted 17 lines · Arend van Spriel

+ Kees

Quoted 7 lines · Atul Raut

One-element arrays are obsolete, and flexible array members have taken their place. So, in struct cca_stats_n_flags, replace the one-element array with a flexible-array member.

This fixes warnings such as:
./drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:119:6-9: WARNING use flexible-array member instead (https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-and-one-element-arrays)

I think this correct, but maybe Kees can give definitive answer here.

Quoted 5 lines
---
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 12 lines

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c struct brcmf_dump_survey { · line 121

Quoted 12 lines
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +1 -1
index de8a2e27f49c..fff32e54833d 100644
@@ -116,7 +116,7 @@ struct brcmf_dump_survey {
   struct cca_stats_n_flags {
     u32 msrmnt_time; /* Time for Measurement (msec) */
     u32 msrmnt_done; /* flag set when measurement complete */
-   char buf[1];
+   char buf[];
   };
   struct cca_msrmnt_query {

Normally a [1] -> [] conversion needs some details in the commit log about why this is safe (since it runs the risk of changing sizeof(struct cca_stats_n_flags). In this case, there's only a single user of the struct, and nothing about its use depends on its size:

#define BRCMF_DCMD_MEDLEN 1536
...

         struct cca_stats_n_flags *results;
         char *buf;
         ...
         buf = kzalloc(sizeof(char) * BRCMF_DCMD_MEDLEN, GFP_KERNEL);
         ...
         results = (struct cca_stats_n_flags *)(buf);
         ...
                 brcmf_parse_dump_obss(results->buf, survey);
Quoted 5 lines

So, the allocation size is big enough for the struct, and nothing depends on the struct size.

As the linux-kernel-mentees mailing list is in CC, I assume that Atul is a linux-kernel mentee. In that case, it is certainly reasonable and at least of educational value for Atul to take Kees' explanation and add this to the patch's commit message in his own words. Then, with that, submit a PATCH v3.

Lukas