Skip to contentSkip to conversation

brcmfmac: enlarge buffer size of caps to 512 bytes

PATCH In review Wright Feng 3 participants 3 messages Dec 11, 2017 – Dec 14, 2017 Broadcom BRCM80211 IEEE802.11 wireless drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 brcmfmac: enlarge buffer size of caps to 512 bytes

The buffer size of return of cap iovar is greater than 256 bytes in some firmwares. For instance, the return size of cap iovar is 271 bytes in 4373 13.10.246.79 firmare. It makes feature capability parsing failed because caps buffer is default value.
So we enlarge caps buffer size to 512 bytes and add the error print for cap iovar error.

---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c +9 -3
index 53ae302..47de35a 100644
@@ -130,13 +130,19 @@ static void brcmf_feat_iovar_data_set(struct brcmf_if *ifp,
 	}
 }
 
+#define MAX_CAPS_BUFFER_SIZE	512
 static void brcmf_feat_firmware_capabilities(struct brcmf_if *ifp)
 {
-	char caps[256];
+	char caps[MAX_CAPS_BUFFER_SIZE];
 	enum brcmf_feat_id id;
-	int i;
+	int i, err;
+
+	err = brcmf_fil_iovar_data_get(ifp, "cap", caps, sizeof(caps));
+	if (err) {
+		brcmf_err("could not get firmware cap (%d)\n", err);
+		return;
+	}
 
-	brcmf_fil_iovar_data_get(ifp, "cap", caps, sizeof(caps));
 	brcmf_dbg(INFO, "[ %s]\n", caps);
 
 	for (i = 0; i < ARRAY_SIZE(brcmf_fwcap_map); i++) {
Signature · 1 line
1.9.1
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Wright Feng

The buffer size of return of cap iovar is greater than 256 bytes in some firmwares. For instance, the return size of cap iovar is 271 bytes in 4373 13.10.246.79 firmare. It makes feature capability parsing failed because caps buffer is default value.
So we enlarge caps buffer size to 512 bytes and add the error print for cap iovar error.

Looks fine to me. However, firmware side is also broken for some chips where released firmware uses 256 bytes (= WLC_IOCTL_SMLEN) but the capability tokens do no longer fit that size and we get a cut-off capability string.

Anyway...

Quoted 4 lines
---
  drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c | 12 +++++++++---
  1 file changed, 9 insertions(+), 3 deletions(-)
#2 lore raw
In reply to Wright Feng
Quoted 9 lines · Wright Feng

The buffer size of return of cap iovar is greater than 256 bytes in some firmwares. For instance, the return size of cap iovar is 271 bytes in 4373 13.10.246.79 firmare. It makes feature capability parsing failed because caps buffer is default value.
So we enlarge caps buffer size to 512 bytes and add the error print for cap iovar error.

Patch applied to wireless-drivers-next.git, thanks.

7762bb134e3b brcmfmac: enlarge buffer size of caps to 512 bytes

Signature · 3 lines
https://patchwork.kernel.org/patch/10104357/

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