pogmommy/nmrpflash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't accept any blksize

Browse source
This commit is contained in:
Joseph C. Lehner 2017-01-10 20:16:09 +01:00
parent a4fb23fdba
commit 549e0da06f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tftp.c
View file

@ -30,7 +30,7 @@
#define O_BINARY 0 #define O_BINARY 0
#endif #endif
#define TFTP_PKT_SIZE 516 #define TFTP_BLKSIZE 1456
static const char *opcode_names[] = { static const char *opcode_names[] = {
"RRQ", "WRQ", "DATA", "ACK", "ERR", "OACK" "RRQ", "WRQ", "DATA", "ACK", "ERR", "OACK"
@ -374,7 +374,7 @@ int tftp_put(struct nmrpd_args *args)
/* Not really, but this way the loop sends our WRQ before receiving */ /* Not really, but this way the loop sends our WRQ before receiving */
timeout = 1; timeout = 1;
pkt_mkwrq(tx, file_remote, 1456); pkt_mkwrq(tx, file_remote, TFTP_BLKSIZE);
while (!g_interrupted) { while (!g_interrupted) {
ackblock = -1; ackblock = -1;
@ -387,7 +387,7 @@ int tftp_put(struct nmrpd_args *args)
ackblock = 0; ackblock = 0;
if ((val = pkt_optval(rx, "blksize"))) { if ((val = pkt_optval(rx, "blksize"))) {
blksize = strtol(val, &end, 10); blksize = strtol(val, &end, 10);
if (!blksize || (*end != '\0')) { if (*end != '\0' || blksize < 8 || blksize > TFTP_BLKSIZE) {
fprintf(stderr, "Error: invalid blksize in OACK: %s\n", val); fprintf(stderr, "Error: invalid blksize in OACK: %s\n", val);
ret = -1; ret = -1;
goto cleanup; goto cleanup;