Type: improvement
Change-Id: Id0a6a9e68725ea7aa0b7da14cf54d14405a907fb
Signed-off-by: Benoît Ganne <bganne@cisco.com>
u16 plen = clib_net_to_host_u16 (ke->length);
ASSERT (plen >= sizeof (*ke) && plen <= rlen);
if (sizeof (*ke) > rlen)
u16 plen = clib_net_to_host_u16 (ke->length);
ASSERT (plen >= sizeof (*ke) && plen <= rlen);
if (sizeof (*ke) > rlen)
+ {
+ ikev2_elog_error ("KE: packet too small");
+ return 0;
+ }
sa->dh_group = clib_net_to_host_u16 (ke->dh_group);
vec_reset_length (ke_data[0]);
sa->dh_group = clib_net_to_host_u16 (ke->dh_group);
vec_reset_length (ke_data[0]);
int len = plen - sizeof (*ikep);
ASSERT (len >= 16 && len <= 256);
if (PREDICT_FALSE (len < 16 || len > 256))
int len = plen - sizeof (*ikep);
ASSERT (len >= 16 && len <= 256);
if (PREDICT_FALSE (len < 16 || len > 256))
+ {
+ ikev2_elog_error ("NONCE: bad size");
+ return 0;
+ }
*nonce = ikep->payload;
return len;
}
*nonce = ikep->payload;
return len;
}
u16 * plen)
{
if (sizeof (*ikep) > rlen)
u16 * plen)
{
if (sizeof (*ikep) > rlen)
+ {
+ ikev2_elog_error ("payload: packet too small");
+ return 0;
+ }
*plen = clib_net_to_host_u16 (ikep->length);
if (*plen < sizeof (*ikep) || *plen > rlen)
*plen = clib_net_to_host_u16 (ikep->length);
if (*plen < sizeof (*ikep) || *plen > rlen)
+ {
+ ikev2_elog_error ("payload: bad size");
+ return 0;
+ }
vec_add (sa->last_sa_init_req_packet_data, ike, len);
if (len < sizeof (*ike))
vec_add (sa->last_sa_init_req_packet_data, ike, len);
if (len < sizeof (*ike))
+ {
+ ikev2_elog_error ("IKE_INIT request too small");
+ return 0;
+ }
len -= sizeof (*ike);
while (p < len && payload != IKEV2_PAYLOAD_NONE)
len -= sizeof (*ike);
while (p < len && payload != IKEV2_PAYLOAD_NONE)
vec_add (sa->last_sa_init_res_packet_data, ike, len);
if (sizeof (*ike) > len)
vec_add (sa->last_sa_init_res_packet_data, ike, len);
if (sizeof (*ike) > len)
+ {
+ ikev2_elog_error ("IKE_INIT response too small");
+ return;
+ }
len -= sizeof (*ike);
while (p < len && payload != IKEV2_PAYLOAD_NONE)
len -= sizeof (*ike);
while (p < len && payload != IKEV2_PAYLOAD_NONE)