jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mka: Avoid inconsistent state in ieee802_1x_kay_move_live_peer()

Browse source 
If the memory allocation in ieee802_1x_kay_init_receive_sc() fails, we
end up in an inconsistent state where the peer is moved to the live
peers list and its sci is setup, but we don't have an rxsc.

Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
This commit is contained in:
Sabrina Dubroca 2016-07-19 11:56:54 +02:00 committed by Jouni Malinen
parent 12447457bf
commit 90bff0e2aa
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/pae/ieee802_1x_kay.c
View file

@ -604,6 +604,11 @@ ieee802_1x_kay_move_live_peer(struct ieee802_1x_mka_participant *participant,
break; break;
} }
rxsc = ieee802_1x_kay_init_receive_sc(&participant->current_peer_sci,
sc_ch);
if (!rxsc)
return NULL;
os_memcpy(&peer->sci, &participant->current_peer_sci, os_memcpy(&peer->sci, &participant->current_peer_sci,
sizeof(peer->sci)); sizeof(peer->sci));
peer->mn = mn; peer->mn = mn;
@ -620,10 +625,6 @@ ieee802_1x_kay_move_live_peer(struct ieee802_1x_mka_participant *participant,
secy_get_available_receive_sc(participant->kay, &sc_ch); secy_get_available_receive_sc(participant->kay, &sc_ch);
rxsc = ieee802_1x_kay_init_receive_sc(&peer->sci, sc_ch);
if (!rxsc)
return NULL;
dl_list_add(&participant->rxsc_list, &rxsc->list); dl_list_add(&participant->rxsc_list, &rxsc->list);
secy_create_receive_sc(participant->kay, rxsc); secy_create_receive_sc(participant->kay, rxsc);