Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d4f929e authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: do string formatting in debug triggers 



The current code has a lot of duplicates of printing into a buffer
(while having to make sure it's NUL-filled and -terminated) and
then passing that to the debug trigger collection.

Since that's error-prone, instead make the debug trigger collection
function take a format string and format arguments (with compiler
validity checking) and handle the buffer internally.

This makes one behavioural change -- instead of sending the whole
buffer to userspace (clearing is needed to not leak stack data) it
just passes the actual string (including NUL-terminator.)

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 0d365ae5

drivers/net/wireless/iwlwifi/mvm/fw.c

+20 −3
Original line number Diff line number Diff line
@@ -526,16 +526,33 @@ int iwl_mvm_fw_dbg_collect(struct iwl_mvm *mvm, enum iwl_fw_dbg_trigger trig, 


int iwl_mvm_fw_dbg_collect_trig(struct iwl_mvm *mvm,

				struct iwl_fw_dbg_trigger_tlv *trigger,

				const char *str, size_t len)

				const char *fmt, ...)

{

	unsigned int delay = msecs_to_jiffies(le32_to_cpu(trigger->stop_delay));

	u16 occurrences = le16_to_cpu(trigger->occurrences);

	int ret;

	int ret, len = 0;

	char buf[64];



	if (!occurrences)

		return 0;



	ret = iwl_mvm_fw_dbg_collect(mvm, le32_to_cpu(trigger->id), str,

	if (fmt) {

		va_list ap;



		buf[sizeof(buf) - 1] = '\0';



		va_start(ap, fmt);

		vsnprintf(buf, sizeof(buf), fmt, ap);

		va_end(ap);



		/* check for truncation */

		if (WARN_ON_ONCE(buf[sizeof(buf) - 1]))

			buf[sizeof(buf) - 1] = '\0';



		len = strlen(buf) + 1;

	}



	ret = iwl_mvm_fw_dbg_collect(mvm, le32_to_cpu(trigger->id), buf,

				     len, delay);

	if (ret)

		return ret;

drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c

+1 −1
Original line number Diff line number Diff line
@@ -1412,7 +1412,7 @@ static void iwl_mvm_beacon_loss_iterator(void *_data, u8 *mac, 


	if (rx_missed_bcon_since_rx >= stop_trig_missed_bcon_since_rx ||

	    rx_missed_bcon >= stop_trig_missed_bcon)

		iwl_mvm_fw_dbg_collect_trig(mvm, trigger, NULL, 0);

		iwl_mvm_fw_dbg_collect_trig(mvm, trigger, NULL);

}



int iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm,

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+2 −7
Original line number Diff line number Diff line
@@ -3961,19 +3961,16 @@ static void iwl_mvm_mac_event_callback(struct ieee80211_hw *hw, 
				       struct ieee80211_vif *vif,

				       const struct ieee80211_event *event)

{

#define CHECK_MLME_TRIGGER(_mvm, _trig, _buf, _cnt, _str...)	\

#define CHECK_MLME_TRIGGER(_mvm, _trig, _buf, _cnt, _fmt...)	\

	do {							\

		if ((_cnt) && --(_cnt))				\

			break;					\

		snprintf(_buf, sizeof(_buf), ##_str);		\

		iwl_mvm_fw_dbg_collect_trig(_mvm, _trig, _buf,	\

					    sizeof(_buf));	\

		iwl_mvm_fw_dbg_collect_trig(_mvm, _trig, _fmt);\

	} while (0)



	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

	struct iwl_fw_dbg_trigger_tlv *trig;

	struct iwl_fw_dbg_trigger_mlme *trig_mlme;

	char buf[32];



	if (!iwl_fw_dbg_trigger_enabled(mvm->fw, FW_DBG_TRIGGER_MLME))

		return;
@@ -3986,8 +3983,6 @@ static void iwl_mvm_mac_event_callback(struct ieee80211_hw *hw, 
	if (!iwl_fw_dbg_trigger_check_stop(mvm, vif, trig))

		return;



	memset(buf, 0, sizeof(buf));



	if (event->u.mlme.data == ASSOC_EVENT) {

		if (event->u.mlme.status == MLME_DENIED)

			CHECK_MLME_TRIGGER(mvm, trig, buf,

drivers/net/wireless/iwlwifi/mvm/mvm.h

+2 −2
Original line number Diff line number Diff line
@@ -1480,7 +1480,7 @@ int iwl_mvm_fw_dbg_collect_desc(struct iwl_mvm *mvm, 
void iwl_mvm_free_fw_dump_desc(struct iwl_mvm *mvm);

int iwl_mvm_fw_dbg_collect_trig(struct iwl_mvm *mvm,

				struct iwl_fw_dbg_trigger_tlv *trigger,

				const char *str, size_t len);

				const char *fmt, ...) __printf(3, 4);

unsigned int iwl_mvm_get_wd_timeout(struct iwl_mvm *mvm,

				    struct ieee80211_vif *vif,

				    bool tdls, bool cmd_q);
@@ -1527,7 +1527,7 @@ iwl_fw_dbg_trigger_simple_stop(struct iwl_mvm *mvm, 
	if (!iwl_fw_dbg_trigger_check_stop(mvm, vif, trigger))

		return;



	iwl_mvm_fw_dbg_collect_trig(mvm, trigger, NULL, 0);

	iwl_mvm_fw_dbg_collect_trig(mvm, trigger, NULL);

}



#endif /* __IWL_MVM_H__ */

drivers/net/wireless/iwlwifi/mvm/ops.c

+3 −4
Original line number Diff line number Diff line
@@ -689,7 +689,6 @@ static inline void iwl_mvm_rx_check_trigger(struct iwl_mvm *mvm, 
{

	struct iwl_fw_dbg_trigger_tlv *trig;

	struct iwl_fw_dbg_trigger_cmd *cmds_trig;

	char buf[32];

	int i;



	if (!iwl_fw_dbg_trigger_enabled(mvm->fw, FW_DBG_TRIGGER_FW_NOTIF))
@@ -709,9 +708,9 @@ static inline void iwl_mvm_rx_check_trigger(struct iwl_mvm *mvm, 
		if (cmds_trig->cmds[i].cmd_id != pkt->hdr.cmd)

			continue;



		memset(buf, 0, sizeof(buf));

		snprintf(buf, sizeof(buf), "CMD 0x%02x received", pkt->hdr.cmd);

		iwl_mvm_fw_dbg_collect_trig(mvm, trig, buf, sizeof(buf));

		iwl_mvm_fw_dbg_collect_trig(mvm, trig,

					    "CMD 0x%02x received",

					    pkt->hdr.cmd);

		break;

	}

}