diff options
| author | Benjamin Berg <benjamin.berg@intel.com> | 2024-03-07 11:11:04 +0100 |
|---|---|---|
| committer | iwlwifi publisher <> | 2024-04-17 13:37:41 +0000 |
| commit | 966e8220b2c9c43dd36c7407abc90615d0b9a3a5 (patch) | |
| tree | 3cfd809f929ae57f00a6928c5f8b1ae7f87b301d | |
| parent | 67e6664e0b0baa5c3e2014b1355a09f8d6463a2f (diff) | |
| download | backport-iwlwifi-966e8220b2c9c43dd36c7407abc90615d0b9a3a5.tar.gz | |
wifi: cfg80211: check BSSID Index against MaxBSSID
Add a verification that the BSSID Index does not exceed the maximum
number of BSSIDs in the Multiple-BSSID set.
type=feature
ticket=none
Change-Id: I02f40c2920a9f602898190679cc27d0c8ee2c67d
Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/98022
tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/99324
Reviewed-by: Golan Ben Ami <golan.ben.ami@intel.com>
tested: Golan Ben Ami <golan.ben.ami@intel.com>
x-iwlwifi-stack-dev: 1d1f0c924f1d2a024351fe54b8e115b790684a66
| -rw-r--r-- | net/wireless/scan.c | 3 | ||||
| -rw-r--r-- | versions | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 16ef1098bc..3843cf61dd 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -2447,7 +2447,8 @@ cfg80211_parse_mbssid_data(struct wiphy *wiphy, profile, profile_len); if (!mbssid_index_ie || mbssid_index_ie[1] < 1 || mbssid_index_ie[2] == 0 || - mbssid_index_ie[2] > 46) { + mbssid_index_ie[2] > 46 || + mbssid_index_ie[2] >= (1 << elem->data[0])) { /* No valid Multiple BSSID-Index element */ continue; } @@ -2,5 +2,5 @@ BACKPORTS_VERSION="(see git)" BACKPORTED_KERNEL_VERSION="(see git)" BACKPORTED_KERNEL_NAME="iwlwifi" BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__ -BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12023:4b01b905" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12024:1d1f0c92" BACKPORTS_BRANCH_TSTAMP="Apr 17 2024 13:11:40" |