d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tftpd: reject unknown opcodes

Browse Source 
If tftpd receives a command with an unknown opcode, it simply exits 1.  It
doesn't send an ERROR packet, and the client will hang waiting for one.  Fix
it.

PR:		226005
MFC after:	3 weeks
This commit is contained in:
asomers 2018-03-10 01:50:43 +00:00
parent c29c7eb33f
commit a6bc631948
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libexec/tftpd/tests/functional.c
View File

@ -677,7 +677,6 @@ TFTPD_TC_DEFINE(unknown_opcode,)
{
/* Looks like an RRQ or WRQ request, but with a bad opcode */
SEND_STR("\0\007foo.txt\0octet\0");
atf_tc_expect_timeout("PR 226005 tftpd ignores bad opcodes but doesn't reject them");
RECV_ERROR(4, "Illegal TFTP operation");
}

6
libexec/tftpd/tftpd.c
View File

@ -421,8 +421,7 @@ main(int argc, char *argv[])
"%s read access denied", peername);
exit(1);
}
}
if (tp->th_opcode == WRQ) {
} else if (tp->th_opcode == WRQ) {
if (allow_wo)
tftp_wrq(peer, tp->th_stuff, n - 1);
else {
@ -430,7 +429,8 @@ main(int argc, char *argv[])
"%s write access denied", peername);
exit(1);
}
}
} else
send_error(peer, EBADOP);
exit(1);
}