diff options
| author | Jouni Malinen <j@w1.fi> | 2015-07-26 10:40:21 +0300 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:19:56 -0600 |
| commit | cd00a4ea462db49416e318171eebbe01d3de72d5 (patch) | |
| tree | a692a2645f47aeef5c4f2690490d22d1ca792e5f /src/fst | |
| parent | d365359298152774c8bcc96fd57a9c33ef7b6843 (diff) | |
| download | android_external_wpa_supplicant_8-cd00a4ea462db49416e318171eebbe01d3de72d5.tar.gz android_external_wpa_supplicant_8-cd00a4ea462db49416e318171eebbe01d3de72d5.tar.bz2 android_external_wpa_supplicant_8-cd00a4ea462db49416e318171eebbe01d3de72d5.zip | |
FST: Fix Session Transition element length field value
The Element ID and Length subfields are not supposed to be included in
the Length. In addition, both of these subfields needs to be filled in
even for non-zero status code cases.
Change-Id: I92ca6b25c7a4243ff88dbcabc000e23f6780d75f
Signed-off-by: Jouni Malinen <j@w1.fi>
Git-commit: e49f535dc518f7609fbbe5ecff9966ad271cf3f2
Git-repo: git://w1.fi/srv/git/hostap.git
CRs-Fixed: 891455
Diffstat (limited to 'src/fst')
| -rw-r--r-- | src/fst/fst_session.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/fst/fst_session.c b/src/fst/fst_session.c index 94122fd9..ac49fcf8 100644 --- a/src/fst/fst_session.c +++ b/src/fst/fst_session.c @@ -893,7 +893,7 @@ int fst_session_initiate_setup(struct fst_session *s) req.llt = host_to_le32(FST_LLT_MS_TO_VAL(s->data.llt_ms)); /* 8.4.2.147 Session Transition element */ req.stie.element_id = WLAN_EID_SESSION_TRANSITION; - req.stie.length = sizeof(req.stie); + req.stie.length = sizeof(req.stie) - 2; req.stie.fsts_id = host_to_le32(fsts_id); req.stie.session_control = SESSION_CONTROL(SESSION_TYPE_BSS, 0); @@ -968,9 +968,10 @@ int fst_session_respond(struct fst_session *s, u8 status_code) res.dialog_token = s->data.pending_setup_req_dlgt; res.status_code = status_code; + res.stie.element_id = WLAN_EID_SESSION_TRANSITION; + res.stie.length = sizeof(res.stie) - 2; + if (status_code == WLAN_STATUS_SUCCESS) { - res.stie.element_id = WLAN_EID_SESSION_TRANSITION; - res.stie.length = sizeof(res.stie); res.stie.fsts_id = s->data.fsts_id; res.stie.session_control = SESSION_CONTROL(SESSION_TYPE_BSS, 0); @@ -1374,7 +1375,7 @@ int fst_test_req_send_fst_request(const char *params) req.llt = host_to_le32(FST_LLT_MS_DEFAULT); /* 8.4.2.147 Session Transition element */ req.stie.element_id = WLAN_EID_SESSION_TRANSITION; - req.stie.length = sizeof(req.stie); + req.stie.length = sizeof(req.stie) - 2; req.stie.fsts_id = host_to_le32(fsts_id); req.stie.session_control = SESSION_CONTROL(SESSION_TYPE_BSS, 0); @@ -1443,9 +1444,10 @@ int fst_test_req_send_fst_response(const char *params) _s->data.pending_setup_req_dlgt : g->dialog_token; res.status_code = status_code; + res.stie.element_id = WLAN_EID_SESSION_TRANSITION; + res.stie.length = sizeof(res.stie) - 2; + if (res.status_code == WLAN_STATUS_SUCCESS) { - res.stie.element_id = WLAN_EID_SESSION_TRANSITION; - res.stie.length = sizeof(res.stie); res.stie.fsts_id = fsts_id; res.stie.session_control = SESSION_CONTROL(SESSION_TYPE_BSS, 0); |