summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authorasomers <asomers@FreeBSD.org>2018-04-16 16:33:35 +0000
committerasomers <asomers@FreeBSD.org>2018-04-16 16:33:35 +0000
commit05fd0fc63cf0092402998a37f7bcdc882462f078 (patch)
treeded64d3e13f7f66ad4ba8172c9f60ea0ee14e3f2 /usr.bin
parent83588cfc807108c3fde99b2205c0570958fe2e7a (diff)
downloadFreeBSD-src-05fd0fc63cf0092402998a37f7bcdc882462f078.zip
FreeBSD-src-05fd0fc63cf0092402998a37f7bcdc882462f078.tar.gz
MFC r330710, r330718-r330720
r330710: tftpd: Flush files as soon as they are fully received On an RRQ, tftpd doesn't exit as soon as it's finished receiving a file. Instead, it waits five seconds just in case the client didn't receive the server's last ACK and decides to resend the final DATA packet. Unfortunately, this created a 5 second delay from when the client thinks it's done sending the file, and when the file is available for other processes. Fix this bug by closing the file as soon as receipt is finished. PR: 157700 Reported by: Barry Mishler <barry_mishler@yahoo.com> r330718: tftpd: Verify world-writability for WRQ when using relative paths tftpd(8) says that files may only be written if they already exist and are publicly writable. tftpd.c verifies that a file is publicly writable if it uses an absolute pathname. However, if the pathname is relative, that check is skipped. Fix it. Note that this is not a security vulnerability, because the transfer ultimately doesn't work unless the file already exists and is owned by user nobody. Also, this bug does not affect the default configuration, because the default uses the "-s" option which makes all pathnames absolute. PR: 226004 r330719: tftpd: Abort on an WRQ access violation On a WRQ (write request) tftpd checks whether the client has access permission for the file in question. If not, then the write is prevented. However, tftpd doesn't reply with an ERROR packet, nor does it abort. Instead, it tries to receive the packet anyway. The symptom is slightly different depending on the nature of the error. If the target file is nonexistent and tftpd lacks permission to create it, then tftpd will willingly receive the file, but not write it anywhere. If the file exists but is not writable, then tftpd will fail to ACK to WRQ. PR: 225996 r330720: tftpd: reject unknown opcodes 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
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/tftp/tftp.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index eaf2a6f..6514af3 100644
--- a/usr.bin/tftp/tftp.c
+++ b/usr.bin/tftp/tftp.c
@@ -263,7 +263,6 @@ recvfile(int peer, char *port, int fd, char *name, char *mode)
tftp_receive(peer, &block, &tftp_stats, rp, n);
}
- write_close();
if (tftp_stats.amount > 0)
printstats("Received", verbose, &tftp_stats);
return;
OpenPOWER on IntegriCloud