mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

staging: r8188eu: calculate the addba request length

Browse source 
When issue_action_BA compiles an addba request, it does not add any
extensions. start_seq_num is the last field of the addba request.

The length of the request is the offset of the end of start_seq_num in the
struct ieee80211_mgmt that defines the message.

Use offsetofend to calculate this offset and drop the intermediate pktlen
increments as we add addba request components. (We have to keep the
increments for other message types until we use offsetofend for them as
well.)

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220524090029.242584-13-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Martin Kaiser 2022-05-24 11:00:29 +02:00 committed by Greg Kroah-Hartman
parent 56580e22fe
commit 76d01595b2
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/staging/r8188eu/core/rtw_mlme_ext.c
View file

@ -5413,22 +5413,18 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch
switch (action) {
case WLAN_ACTION_ADDBA_REQ:
mgmt->u.action.u.addba_req.action_code = WLAN_ACTION_ADDBA_REQ;
pattrib->pktlen++;
do {
pmlmeinfo->dialogToken++;
} while (pmlmeinfo->dialogToken == 0);
mgmt->u.action.u.addba_req.dialog_token = pmlmeinfo->dialogToken;
pattrib->pktlen++;
/* immediate ack & 64 buffer size */
capab = u16_encode_bits(64, IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK);
capab |= u16_encode_bits(1, IEEE80211_ADDBA_PARAM_POLICY_MASK);
capab |= u16_encode_bits(status, IEEE80211_ADDBA_PARAM_TID_MASK);
mgmt->u.action.u.addba_req.capab = cpu_to_le16(capab);
pattrib->pktlen += 2;
mgmt->u.action.u.addba_req.timeout = cpu_to_le16(5000); /* 5 ms */
pattrib->pktlen += 2;
psta = rtw_get_stainfo(pstapriv, raddr);
if (psta) {
@ -5439,7 +5435,9 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch
BA_starting_seqctrl = start_seq << 4;
}
mgmt->u.action.u.addba_req.start_seq_num = cpu_to_le16(BA_starting_seqctrl);
pattrib->pktlen += 2;
pattrib->pktlen = offsetofend(struct ieee80211_mgmt,
u.action.u.addba_req.start_seq_num);
break;
case WLAN_ACTION_ADDBA_RESP:
mgmt->u.action.u.addba_resp.action_code = WLAN_ACTION_ADDBA_RESP;