Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert tftp block number overflow check. Wrapping block nos is fine.

Browse Source
This commit is contained in:
Simon Kelley
2020-01-07 20:30:16 +00:00
parent 2ac4cf0146
commit c7a44c4690
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/tftp.c
View File

@@ -602,13 +602,7 @@ void check_tftp_listeners(time_t now)
/* we overwrote the buffer... */ /* we overwrote the buffer... */
daemon->srv_save = NULL; daemon->srv_save = NULL;
/* check for wrap of 16 bit block no. */ if ((len = get_block(daemon->packet, transfer)) == -1)
if (transfer->block == 0x10000)
{
len = tftp_err(ERR_ILL, daemon->packet, _("too many blocks"), NULL);
endcon = 1;
}
else if ((len = get_block(daemon->packet, transfer)) == -1)
{ {
len = tftp_err_oops(daemon->packet, transfer->file->filename); len = tftp_err_oops(daemon->packet, transfer->file->filename);
endcon = 1; endcon = 1;
@@ -741,8 +735,7 @@ static ssize_t tftp_err(int err, char *packet, char *message, char *file)
char *errstr = strerror(errno); char *errstr = strerror(errno);
memset(packet, 0, daemon->packet_buff_sz); memset(packet, 0, daemon->packet_buff_sz);
if (file) sanitise(file);
sanitise(file);
mess->op = htons(OP_ERR); mess->op = htons(OP_ERR);
mess->err = htons(err); mess->err = htons(err);