diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2024-02-12 14:20:24 +0100 |
|---|---|---|
| committer | iwlwifi publisher <> | 2024-04-17 12:49:56 +0000 |
| commit | 8464c4a583e27edf0477d242776a73004af6e026 (patch) | |
| tree | 0a3140a33db51931dd2bfb4a92a6dc259f6c42e5 | |
| parent | 28dbfb922698077d396bc221f853a5fe565a5719 (diff) | |
| download | backport-iwlwifi-8464c4a583e27edf0477d242776a73004af6e026.tar.gz | |
wifi: ieee80211: fix ieee80211_mle_basic_sta_prof_size_ok()
If there was a possibility of an MLE basic STA profile without
subelements, we might reject it because we account for the one
octet for sta_info_len twice (it's part of itself, and in the
fixed portion). Like in ieee80211_mle_reconf_sta_prof_size_ok,
subtract 1 to adjust that.
When reading the elements we did take this into account, and
since there are always elements, this never really mattered.
type=cleanup
fixes=Id5f39b418dc91617378ae448a75e573f3146ec80
ticket=none
Change-Id: I8c41dd6fc14c4b187ab901dea15ade73c79fb98c
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/94112
automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-by: Ilan Peer <ilan.peer@intel.com>
x-iwlwifi-stack-dev: 87c7f032081c2b97a966cd610aabee1543d31772
| -rw-r--r-- | include/linux/ieee80211.h | 2 | ||||
| -rw-r--r-- | versions | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 94cec58fe0..b71b7f4638 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -5378,7 +5378,7 @@ static inline bool ieee80211_mle_basic_sta_prof_size_ok(const u8 *data, info_len += 1; return prof->sta_info_len >= info_len && - fixed + prof->sta_info_len <= len; + fixed + prof->sta_info_len - 1 <= len; } /** @@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)" BACKPORTED_KERNEL_VERSION="(see git)" BACKPORTED_KERNEL_NAME="iwlwifi" BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__ -BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11901:eded020a" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11902:87c7f032" |