diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-01-02 13:19:40 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-01-02 13:19:40 -0500 |
| commit | 9cc52627c702b73c633737db40914ab8fc467de8 (patch) | |
| tree | 50dedcb98dcd3c239cddcad006fe815f62046f94 /net/mac80211/mlme.c | |
| parent | 731859dde86e23b0f11e700431e460ea76769584 (diff) | |
| parent | aad86da229bc9d0390dc2c02eb0db9ab1f50d059 (diff) | |
| download | linux-stable-9cc52627c702b73c633737db40914ab8fc467de8.tar.gz linux-stable-9cc52627c702b73c633737db40914ab8fc467de8.tar.bz2 linux-stable-9cc52627c702b73c633737db40914ab8fc467de8.zip | |
Merge tag 'kvm-riscv-6.8-1' of https://github.com/kvm-riscv/linux into HEAD
KVM/riscv changes for 6.8 part #1
- KVM_GET_REG_LIST improvement for vector registers
- Generate ISA extension reg_list using macros in get-reg-list selftest
- Steal time account support along with selftest
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 887b496f2b81..c8998cf01b7a 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -5782,7 +5782,7 @@ static void ieee80211_ml_reconfiguration(struct ieee80211_sub_if_data *sdata, { const struct ieee80211_multi_link_elem *ml; const struct element *sub; - size_t ml_len; + ssize_t ml_len; unsigned long removed_links = 0; u16 link_removal_timeout[IEEE80211_MLD_MAX_NUM_LINKS] = {}; u8 link_id; @@ -5798,6 +5798,8 @@ static void ieee80211_ml_reconfiguration(struct ieee80211_sub_if_data *sdata, elems->scratch + elems->scratch_len - elems->scratch_pos, WLAN_EID_FRAGMENT); + if (ml_len < 0) + return; elems->ml_reconf = (const void *)elems->scratch_pos; elems->ml_reconf_len = ml_len; |