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

wifi: wil6210: wmi: Use __counted_by() in struct wmi_set_link_monitor_cmd and... 

wifi: wil6210: wmi: Use __counted_by() in struct wmi_set_link_monitor_cmd and avoid -Wfamnae warning

Prepare for the coming implementation by GCC and Clang of the
__counted_by attribute. Flexible array members annotated with
__counted_by can have their accesses bounds-checked at run-time
via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE
(for strcpy/memcpy-family functions).

Also, -Wflex-array-member-not-at-end is coming in GCC-14, and we are
getting ready to enable it globally.

So, use the `DEFINE_FLEX()` helper for an on-stack definition of
a flexible structure where the size of the flexible-array member
is known at compile-time, and refactor the rest of the code,
accordingly.

So, with these changes, fix the following warning:
drivers/net/wireless/ath/wil6210/wmi.c:4018:49: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]

Link: https://github.com/KSPP/linux/issues/202


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://msgid.link/ZgSTCmdP+omePvWg@neat
parent 34c34c24

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

+7 −12
Original line number Diff line number Diff line
@@ -4014,28 +4014,23 @@ int wmi_set_cqm_rssi_config(struct wil6210_priv *wil, 
	struct net_device *ndev = wil->main_ndev;

	struct wil6210_vif *vif = ndev_to_vif(ndev);

	int rc;

	struct {

		struct wmi_set_link_monitor_cmd cmd;

		s8 rssi_thold;

	} __packed cmd = {

		.cmd = {

			.rssi_hyst = rssi_hyst,

			.rssi_thresholds_list_size = 1,

		},

		.rssi_thold = rssi_thold,

	};

	struct {

		struct wmi_cmd_hdr hdr;

		struct wmi_set_link_monitor_event evt;

	} __packed reply = {

		.evt = {.status = WMI_FW_STATUS_FAILURE},

	};

	DEFINE_FLEX(struct wmi_set_link_monitor_cmd, cmd,

		    rssi_thresholds_list, rssi_thresholds_list_size, 1);



	cmd->rssi_hyst = rssi_hyst;

	cmd->rssi_thresholds_list[0] = rssi_thold;



	if (rssi_thold > S8_MAX || rssi_thold < S8_MIN || rssi_hyst > U8_MAX)

		return -EINVAL;



	rc = wmi_call(wil, WMI_SET_LINK_MONITOR_CMDID, vif->mid, &cmd,

		      sizeof(cmd), WMI_SET_LINK_MONITOR_EVENTID,

	rc = wmi_call(wil, WMI_SET_LINK_MONITOR_CMDID, vif->mid, cmd,

		      __struct_size(cmd), WMI_SET_LINK_MONITOR_EVENTID,

		      &reply, sizeof(reply), WIL_WMI_CALL_GENERAL_TO_MS);

	if (rc) {

		wil_err(wil, "WMI_SET_LINK_MONITOR_CMDID failed, rc %d\n", rc);

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

+1 −1
Original line number Diff line number Diff line
@@ -3320,7 +3320,7 @@ struct wmi_set_link_monitor_cmd { 
	u8 rssi_hyst;

	u8 reserved[12];

	u8 rssi_thresholds_list_size;

	s8 rssi_thresholds_list[];

	s8 rssi_thresholds_list[] __counted_by(rssi_thresholds_list_size);

} __packed;



/* wmi_link_monitor_event_type */