vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/net/tftp.c (tftp_receive): Silently discard too short

Browse source 
packets rather than raising an error.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-12 19:11:06 +01:00
parent 59bfe502c9
commit 0cf69874ee
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-02-12 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/net/tftp.c (tftp_receive): Silently discard too short
packets rather than raising an error.
2012-02-12 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-12 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/xnu.c (grub_xnu_writetree_toheap_real): Avoid set * grub-core/loader/xnu.c (grub_xnu_writetree_toheap_real): Avoid set

14
grub-core/net/tftp.c
View file

@ -160,7 +160,10 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__ ((unused)),
grub_uint8_t *ptr; grub_uint8_t *ptr;
if (nb->tail - nb->data < (grub_ssize_t) sizeof (tftph->opcode)) if (nb->tail - nb->data < (grub_ssize_t) sizeof (tftph->opcode))
return grub_error (GRUB_ERR_OUT_OF_RANGE, "TFTP packet too small"); {
grub_dprintf ("tftp", "TFTP packet too small\n");
return GRUB_ERR_NONE;
}
tftph = (struct tftphdr *) nb->data; tftph = (struct tftphdr *) nb->data;
switch (grub_be_to_cpu16 (tftph->opcode)) switch (grub_be_to_cpu16 (tftph->opcode))
@ -184,16 +187,17 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__ ((unused)),
grub_netbuff_free (nb); grub_netbuff_free (nb);
err = ack (data->sock, 0); err = ack (data->sock, 0);
grub_error_save (&data->save_err); grub_error_save (&data->save_err);
if (err)
return err;
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
case TFTP_DATA: case TFTP_DATA:
if (nb->tail - nb->data < (grub_ssize_t) (sizeof (tftph->opcode) if (nb->tail - nb->data < (grub_ssize_t) (sizeof (tftph->opcode)
+ sizeof (tftph->u.data.block))) + sizeof (tftph->u.data.block)))
return grub_error (GRUB_ERR_OUT_OF_RANGE, "TFTP packet too small"); {
grub_dprintf ("tftp", "TFTP packet too small\n");
return GRUB_ERR_NONE;
}
err = ack (data->sock, tftph->u.data.block); err = ack (data->sock, tftph->u.data.block);
if (err) if (err)
return err; return err;
err = grub_priority_queue_push (data->pq, &nb); err = grub_priority_queue_push (data->pq, &nb);
if (err) if (err)