Commit fea2104e authored May 06, 2023 by Christophe JAILLET Committed by Greg Kroah-Hartman Jul 27, 2023

wifi: mwifiex: Fix the size of a memory allocation in mwifiex_ret_802_11_scan()



[ Upstream commit d9aef04fcfa81ee4fb2804a21a3712b7bbd936af ]

The type of "mwifiex_adapter->nd_info" is "struct cfg80211_wowlan_nd_info",
not "struct cfg80211_wowlan_nd_match".

Use struct_size() to ease the computation of the needed size.

The current code over-allocates some memory, so is safe.
But it wastes 32 bytes.

Fixes: 7d7f07d8 ("mwifiex: add wowlan net-detect support")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/7a6074fb056d2181e058a3cc6048d8155c20aec7.1683371982.git.christophe.jaillet@wanadoo.fr


Signed-off-by: Sasha Levin <sashal@kernel.org>

parent bc509951

drivers/net/wireless/marvell/mwifiex/scan.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -2202,9 +2202,9 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,

		if (nd_config) {
		adapter->nd_info =
		kzalloc(sizeof(struct cfg80211_wowlan_nd_match) +
		sizeof(struct cfg80211_wowlan_nd_match )
		scan_rsp->number_of_sets, GFP_ATOMIC);
		kzalloc(struct_size(adapter->nd_info, matches,
		scan_rsp->number_of_sets),
		GFP_ATOMIC);

		if (adapter->nd_info)
		adapter->nd_info->n_matches = scan_rsp->number_of_sets;