EAP-IKEv2 peer: Avoid undefined behavior in pointer arithmetic
Reorder terms in a way that no invalid pointers are generated with pos+len operations. end-pos is always defined (with a valid pos pointer) while pos+len could end up pointing beyond the end pointer which would be undefined behavior. Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
parent
0421d47e34
commit
3991cb7b3c
1 changed files with 2 additions and 2 deletions
|
@ -128,7 +128,7 @@ static int ikev2_parse_transform(struct ikev2_proposal_data *prop,
|
|||
|
||||
t = (const struct ikev2_transform *) pos;
|
||||
transform_len = WPA_GET_BE16(t->transform_length);
|
||||
if (transform_len < (int) sizeof(*t) || pos + transform_len > end) {
|
||||
if (transform_len < (int) sizeof(*t) || transform_len > end - pos) {
|
||||
wpa_printf(MSG_INFO, "IKEV2: Invalid transform length %d",
|
||||
transform_len);
|
||||
return -1;
|
||||
|
@ -248,7 +248,7 @@ static int ikev2_parse_proposal(struct ikev2_proposal_data *prop,
|
|||
|
||||
ppos = (const u8 *) (p + 1);
|
||||
pend = pos + proposal_len;
|
||||
if (ppos + p->spi_size > pend) {
|
||||
if (p->spi_size > pend - ppos) {
|
||||
wpa_printf(MSG_INFO, "IKEV2: Not enough room for SPI "
|
||||
"in proposal");
|
||||
return -1;
|
||||
|
|
Loading…
Reference in a new issue