diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2024-02-09 15:50:29 +0100 |
|---|---|---|
| committer | iwlwifi publisher <> | 2024-04-17 12:45:33 +0000 |
| commit | ee9067e23aee09797ff85b5dfe432b38f8485abe (patch) | |
| tree | e2f091d62f0be21bdecf0d18b65d559ec286dcaa | |
| parent | 4086074009a35276ba20ca93ca7a69332c27b480 (diff) | |
| download | backport-iwlwifi-ee9067e23aee09797ff85b5dfe432b38f8485abe.tar.gz | |
[BUGFIX] wifi: mac80211: update scratch_pos after defrag
The scratch_pos update here was lost after defrag, so any
other uses of the scratch buffer might overwrite it.
type=bugfix
fixes=I34280ae3728597056a6a2f313063962206c0d581
ticket=none
Change-Id: I7127f2918ec4cba416fcbc35eacaea10262c1268
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/93717
automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Benjamin Berg <benjamin.berg@intel.com>
Reviewed-by: Ilan Peer <ilan.peer@intel.com>
Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
x-iwlwifi-stack-dev: c0dc3d83f61e2b9ba41a9e3aef3a78d9cad219b2
| -rw-r--r-- | net/mac80211/parse.c | 1 | ||||
| -rw-r--r-- | versions | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/parse.c b/net/mac80211/parse.c index d931322d28..a3546fef98 100644 --- a/net/mac80211/parse.c +++ b/net/mac80211/parse.c @@ -812,6 +812,7 @@ static void ieee80211_mle_parse_link(struct ieee802_11_elems *elems, elems->ml_basic = (const void *)elems->scratch_pos; elems->ml_basic_len = ml_len; + elems->scratch_pos += ml_len; ieee80211_mle_get_sta_prof(elems, params->link_id); prof = elems->prof; @@ -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:11879:9c8adcfb" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11880:c0dc3d83" |