From be918cbc3142cf6aa0d23e22960513f3c250f71e Mon Sep 17 00:00:00 2001 From: Carter Chen Date: Fri, 15 Dec 2023 01:14:10 -0600 Subject: [PATCH 194/296] brcmfmac: fix kernel 6.1 insert driver warning --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 2 +- drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c index c7e37a832469..36309a954861 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c @@ -1976,7 +1976,7 @@ brcmf_pktfilter_add_remove(struct net_device *ndev, int filter_num, bool add) (add ? "add" : "remove"), filter_num); pkt_filter = kzalloc(sizeof(*pkt_filter) + - (MAX_PKTFILTER_PATTERN_SIZE * 2), GFP_ATOMIC); + (MAX_PKTFILTER_PATTERN_FILL_SIZE), GFP_ATOMIC); if (!pkt_filter) return -ENOMEM; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h index 07a93445012b..fb83a8187ac6 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h @@ -162,6 +162,7 @@ enum { }; #define MAX_PKTFILTER_PATTERN_SIZE 16 +#define MAX_PKTFILTER_PATTERN_FILL_SIZE (MAX_PKTFILTER_PATTERN_SIZE * 2) #define BRCMF_COUNTRY_BUF_SZ 4 #define BRCMF_ANT_MAX 4 @@ -354,7 +355,7 @@ struct brcmf_pkt_filter_pattern_le { * Variable length mask and pattern data. mask starts at offset 0. * Pattern immediately follows mask. */ - u8 mask_and_pattern[1]; + u8 mask_and_pattern[MAX_PKTFILTER_PATTERN_FILL_SIZE]; }; /* IOVAR "pkt_filter_add" parameter. Used to install packet filters. */ -- 2.25.1