Commit 56f1257f authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Kalle Valo
Browse files

ath6kl: wmi: Replace one-element array with flexible-array member in struct wmi_start_scan_cmd 

Replace one-element array with flexible-array member in struct
wmi_start_scan_cmd. Also, make use of the struct_size() helper.

This issue was found with the help of Coccinelle and audited and fixed,
manually.

Link: https://www.kernel.org/doc/html/v5.16/process/deprecated.html#zero-length-and-one-element-arrays
Link: https://github.com/KSPP/linux/issues/79


Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: default avatarJeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/8b33c6d86a6bd40b5688cf118b4b35850db8d8c7.1645736204.git.gustavoars@kernel.org
parent 324edddf

drivers/net/wireless/ath/ath6kl/wmi.c

+1 −7
Original line number Diff line number Diff line
@@ -1959,21 +1959,15 @@ static int ath6kl_wmi_startscan_cmd(struct wmi *wmi, u8 if_idx, 
{

	struct sk_buff *skb;

	struct wmi_start_scan_cmd *sc;

	s8 size;

	int i, ret;



	size = sizeof(struct wmi_start_scan_cmd);



	if ((scan_type != WMI_LONG_SCAN) && (scan_type != WMI_SHORT_SCAN))

		return -EINVAL;



	if (num_chan > WMI_MAX_CHANNELS)

		return -EINVAL;



	if (num_chan)

		size += sizeof(u16) * (num_chan - 1);



	skb = ath6kl_wmi_get_new_buf(size);

	skb = ath6kl_wmi_get_new_buf(struct_size(sc, ch_list, num_chan));

	if (!skb)

		return -ENOMEM;

drivers/net/wireless/ath/ath6kl/wmi.h

+1 −1
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ struct wmi_start_scan_cmd { 
	u8 num_ch;



	/* channels in Mhz */

	__le16 ch_list[1];

	__le16 ch_list[];

} __packed;



/*