narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check for correct block number in tftp_rx_data(). 

(Problem observed by Clay McClure in VMware Fusion.)
pull/1/head
Michael Brown 2007-09-08 19:30:25 +01:00
parent fbec308f41
commit 972f293e46
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/net/udp/tftp.c
View File

@ -415,7 +415,7 @@ static int tftp_rx_oack ( struct tftp_request *tftp, void *buf, size_t len ) {
static int tftp_rx_data ( struct tftp_request *tftp, static int tftp_rx_data ( struct tftp_request *tftp,
struct io_buffer *iobuf ) { struct io_buffer *iobuf ) {
struct tftp_data *data = iobuf->data; struct tftp_data *data = iobuf->data;
unsigned int block; int block;
size_t data_len; size_t data_len;
int rc; int rc;
@ -432,6 +432,14 @@ static int tftp_rx_data ( struct tftp_request *tftp,
iob_pull ( iobuf, sizeof ( *data ) ); iob_pull ( iobuf, sizeof ( *data ) );
data_len = iob_len ( iobuf ); data_len = iob_len ( iobuf );
/* Check for correct block */
if ( block != ( tftp->state + 1 ) ) {
DBGC ( tftp, "TFTP %p received out-of-order block %d "
"(expecting %d)\n", tftp, block, ( tftp->state + 1 ) );
free_iob ( iobuf );
return 0;
}
/* Deliver data */ /* Deliver data */
if ( ( rc = xfer_deliver_iob ( &tftp->xfer, iobuf ) ) != 0 ) { if ( ( rc = xfer_deliver_iob ( &tftp->xfer, iobuf ) ) != 0 ) {
DBGC ( tftp, "TFTP %p could not deliver data: %s\n", DBGC ( tftp, "TFTP %p could not deliver data: %s\n",