Commit 888a325f authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: ieee80211: reorder presence checks in MLE per-STA profile 



In ieee80211_mle_sta_prof_size_ok(), the presence
checks aren't ordered by field order, so that's a
bit confusing. Reorder them.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230618214436.fdbf17320a37.I517cf27fdc3f6e5d6a2615182da47ba4bdf14039@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 8eb8dd2f

include/linux/ieee80211.h

+2 −3
Original line number Diff line number Diff line
@@ -4876,9 +4876,6 @@ static inline bool ieee80211_mle_basic_sta_prof_size_ok(const u8 *data, 
		info_len += 8;

	if (control & IEEE80211_MLE_STA_CONTROL_DTIM_INFO_PRESENT)

		info_len += 2;

	if (control & IEEE80211_MLE_STA_CONTROL_BSS_PARAM_CHANGE_CNT_PRESENT)

		info_len += 1;



	if (control & IEEE80211_MLE_STA_CONTROL_COMPLETE_PROFILE &&

	    control & IEEE80211_MLE_STA_CONTROL_NSTR_BITMAP_SIZE) {

		if (control & IEEE80211_MLE_STA_CONTROL_NSTR_BITMAP_SIZE)
@@ -4886,6 +4883,8 @@ static inline bool ieee80211_mle_basic_sta_prof_size_ok(const u8 *data, 
		else

			info_len += 1;

	}

	if (control & IEEE80211_MLE_STA_CONTROL_BSS_PARAM_CHANGE_CNT_PRESENT)

		info_len += 1;



	return prof->sta_info_len >= info_len &&

	       fixed + prof->sta_info_len <= len;