denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid potentially unaligned half-word read

Browse Source
This commit is contained in:
Martin Willi
2009-11-23 13:49:19 +01:00
parent ad78bb13c8
commit 0d1d19b99d
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/sa/tasks/child_create.c
+8 -5
View File
@@ -1011,15 +1011,18 @@ static status_t process_i(private_child_create_t *this, message_t *message)
case INVALID_KE_PAYLOAD: case INVALID_KE_PAYLOAD:
{ {
chunk_t data; chunk_t data;
diffie_hellman_group_t bad_group; u_int16_t group = MODP_NONE;
bad_group = this->dh_group;
data = notify->get_notification_data(notify); data = notify->get_notification_data(notify);
this->dh_group = ntohs(*((u_int16_t*)data.ptr)); if (data.len == sizeof(group))
{
memcpy(&group, data.ptr, data.len);
group = ntohs(group);
}
DBG1(DBG_IKE, "peer didn't accept DH group %N, " DBG1(DBG_IKE, "peer didn't accept DH group %N, "
"it requested %N", diffie_hellman_group_names, "it requested %N", diffie_hellman_group_names,
bad_group, diffie_hellman_group_names, this->dh_group); this->dh_group, diffie_hellman_group_names, group);
this->dh_group = group;
this->public.task.migrate(&this->public.task, this->ike_sa); this->public.task.migrate(&this->public.task, this->ike_sa);
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
return NEED_MORE; return NEED_MORE;