![[BACK]](/icons/back.gif){kind=icon}
Up to [local] / src / usr.sbin / tftpd
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.51 / (download) - annotate - [select for diffs], Tue May 21 05:00:48 2024 UTC (11 days, 13 hours ago) by jsg
Branch: MAIN
CVS Tags: HEAD
Changes since 1.50: +1 -2 lines
Diff to previous 1.50 (colored)
remove prototypes with no matching function and externs with no var partly checked by millert@
Revision 1.50 / (download) - annotate - [select for diffs], Sun Oct 9 23:04:57 2022 UTC (19 months, 3 weeks ago) by kn
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE,
OPENBSD_7_5,
OPENBSD_7_4_BASE,
OPENBSD_7_4,
OPENBSD_7_3_BASE,
OPENBSD_7_3
Changes since 1.49: +2 -2 lines
Diff to previous 1.49 (colored)
Drop fattr promise unless file creation is allowed This is only required for the single fchmod(2) ensuring default permissions which only happens in the -c code path. OK millert
Revision 1.49 / (download) - annotate - [select for diffs], Tue Oct 4 23:33:22 2022 UTC (19 months, 3 weeks ago) by kn
Branch: MAIN
Changes since 1.48: +15 -5 lines
Diff to previous 1.48 (colored)
Switch default to read-only, add -w for write access (previous default) Write access seems less often required these days and other ways to ensure effective read-only access are mere workarounds; worst case malicious users can fill up the server's disk by writing to existing files. diskless(8) only ever needs to read and running with "stdio rpath dns inet" by default is much safer for a network daemon without any authentication. Initially proposed as a new -R flag for read-only mode new default suggestion dlg deraadt "looks great" millert OK sthen dlg
Revision 1.48 / (download) - annotate - [select for diffs], Tue Oct 4 07:05:28 2022 UTC (19 months, 4 weeks ago) by kn
Branch: MAIN
Changes since 1.47: +8 -3 lines
Diff to previous 1.47 (colored)
Drop cpath promise unless file creation is allowed OK millert
Revision 1.47 / (download) - annotate - [select for diffs], Sun Oct 24 21:24:19 2021 UTC (2 years, 7 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_7_2_BASE,
OPENBSD_7_2,
OPENBSD_7_1_BASE,
OPENBSD_7_1
Changes since 1.46: +2 -2 lines
Diff to previous 1.46 (colored)
For open/openat, if the flags parameter does not contain O_CREAT, the 3rd (variadic) mode_t parameter is irrelevant. Many developers in the past have passed mode_t (0, 044, 0644, or such), which might lead future people to copy this broken idiom, and perhaps even believe this parameter has some meaning or implication or application. Delete them all. This comes out of a conversation where tb@ noticed that a strange (but intentional) pledge behaviour is to always knock-out high-bits from mode_t on a number of system calls as a safety factor, and his bewilderment that this appeared to be happening against valid modes (at least visually), but no sorry, they are all irrelevant junk. They could all be 0xdeafbeef. ok millert
Revision 1.46 / (download) - annotate - [select for diffs], Sun Jan 17 13:38:30 2021 UTC (3 years, 4 months ago) by claudio
Branch: MAIN
CVS Tags: OPENBSD_7_0_BASE,
OPENBSD_7_0,
OPENBSD_6_9_BASE,
OPENBSD_6_9
Changes since 1.45: +1 -3 lines
Diff to previous 1.45 (colored)
Remove a __KAME__ block for extracting the scope_id from IPV6_PKTINFO. struct in6_pktinfo includes the interface index in ipi6_ifindex but no struct sockaddr_in6. OK jca@
Revision 1.45 / (download) - annotate - [select for diffs], Thu Dec 17 02:06:23 2020 UTC (3 years, 5 months ago) by krw
Branch: MAIN
Changes since 1.44: +10 -3 lines
Diff to previous 1.44 (colored)
Log reason a request is NAK'ed, as well as any problems sending the NAK. Suggestion & ok dlg@
Revision 1.44 / (download) - annotate - [select for diffs], Thu Jan 9 22:29:27 2020 UTC (4 years, 4 months ago) by dlg
Branch: MAIN
CVS Tags: OPENBSD_6_8_BASE,
OPENBSD_6_8,
OPENBSD_6_7_BASE,
OPENBSD_6_7
Changes since 1.43: +14 -14 lines
Diff to previous 1.43 (colored)
resend the current block if the other end acks the previous block again. without this we just bump the timeout, which delays resending the block, which means the client gives up before they get the data. this seems to fix "timeouts" ive had a lot recently with uefi pxe stacks, and fetching firmware images on certain switches, all over busy networks.
Revision 1.43 / (download) - annotate - [select for diffs], Wed Jul 3 03:24:03 2019 UTC (4 years, 11 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_6_6_BASE,
OPENBSD_6_6
Changes since 1.42: +3 -3 lines
Diff to previous 1.42 (colored)
snprintf/vsnprintf return < 0 on error, rather than -1.
Revision 1.42 / (download) - annotate - [select for diffs], Fri Jun 28 13:32:51 2019 UTC (4 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.41: +5 -5 lines
Diff to previous 1.41 (colored)
When system calls indicate an error they return -1, not some arbitrary value < 0. errno is only updated in this case. Change all (most?) callers of syscalls to follow this better, and let's see if this strictness helps us in the future.
Revision 1.41 / (download) - annotate - [select for diffs], Fri Jan 26 16:40:14 2018 UTC (6 years, 4 months ago) by naddy
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE,
OPENBSD_6_5,
OPENBSD_6_4_BASE,
OPENBSD_6_4,
OPENBSD_6_3_BASE,
OPENBSD_6_3
Changes since 1.40: +3 -1 lines
Diff to previous 1.40 (colored)
Handle the transfer size option when faking up /etc/random.seed. Without this, clients that queried the size would receive 0 as response. ok jca@
Revision 1.40 / (download) - annotate - [select for diffs], Tue Nov 7 14:15:38 2017 UTC (6 years, 6 months ago) by jca
Branch: MAIN
Changes since 1.39: +41 -8 lines
Diff to previous 1.39 (colored)
Add support for client-specific directories (named after the client address) tftpd -i will look up the requested path the directory named after the client's IP address. For read requests, if the file is not found, there's a fall back to its root directory. From Jan Klemkow with input and tweaks from at least jmc@, bluhm@, deraadt@, sthen@, semarie@ and myself. ok bluhm@
Revision 1.39 / (download) - annotate - [select for diffs], Fri May 26 17:38:46 2017 UTC (7 years ago) by florian
Branch: MAIN
CVS Tags: OPENBSD_6_2_BASE,
OPENBSD_6_2
Changes since 1.38: +5 -5 lines
Diff to previous 1.38 (colored)
Sync the severity of the syslog_* functions shared between identd, slowcgi, tftp-proxy and tftpd to the severity used in log.c style loggers. This also fixes an issue where syslog_err and syslog_errx logged with different severities. Sure deraadt@
Revision 1.38 / (download) - annotate - [select for diffs], Mon Sep 26 17:15:19 2016 UTC (7 years, 8 months ago) by jca
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE,
OPENBSD_6_1
Changes since 1.37: +7 -1 lines
Diff to previous 1.37 (colored)
Exit early from rdaemon() is the passed fd is invalid. fd == -1 check suggested by deraadt@, ok florian@
Revision 1.37 / (download) - annotate - [select for diffs], Sun Sep 4 14:41:49 2016 UTC (7 years, 8 months ago) by florian
Branch: MAIN
Changes since 1.36: +44 -14 lines
Diff to previous 1.36 (colored)
Add format attribute to logger functions. Add syslog_debug to keep in sync with others. Input & OK benno@
Revision 1.36 / (download) - annotate - [select for diffs], Thu Mar 31 23:03:26 2016 UTC (8 years, 2 months ago) by jca
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE,
OPENBSD_6_0
Changes since 1.35: +2 -2 lines
Diff to previous 1.35 (colored)
For consistency, omit the variable name in rdaemon() prototype.
Revision 1.35 / (download) - annotate - [select for diffs], Thu Mar 31 23:00:46 2016 UTC (8 years, 2 months ago) by jca
Branch: MAIN
Changes since 1.34: +37 -5 lines
Diff to previous 1.34 (colored)
Go in the background much later, to reduce possible silent failures. rev. 1.34 moved the call to daemon() before the chroot, thus hiding errors if the target directory or _tftpd user don't exist. To go in the background later we need to preopen /dev/null. The code is put in a daemon(3) like function that could be used in other daemons. Lack of error reporting spotted by ajacoutot@, initial diff from dlg@. rdaemon() "concept" discussed with semarie@. ok ajacoutot@ dlg@
Revision 1.34 / (download) - annotate - [select for diffs], Mon Dec 14 16:34:55 2015 UTC (8 years, 5 months ago) by semarie
Branch: MAIN
CVS Tags: OPENBSD_5_9_BASE,
OPENBSD_5_9
Changes since 1.33: +4 -4 lines
Diff to previous 1.33 (colored)
move daemon(3) call before chroot(2) in tftpd. so daemon(3) will be able to redirect standard input, standard output and standard error to /dev/null. ok jca@
Revision 1.33 / (download) - annotate - [select for diffs], Fri Dec 11 20:11:10 2015 UTC (8 years, 5 months ago) by mmcc
Branch: MAIN
Changes since 1.32: +2 -3 lines
Diff to previous 1.32 (colored)
Remove NULL-checks before free().
Revision 1.32 / (download) - annotate - [select for diffs], Sun Oct 18 03:54:22 2015 UTC (8 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.31: +2 -2 lines
Diff to previous 1.31 (colored)
Add "dns" to the pledges. Previously these worked because of "inet", alas "dns" is now a mandatory statement if you want to do dns!
Revision 1.31 / (download) - annotate - [select for diffs], Sat Oct 10 22:21:39 2015 UTC (8 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.30: +4 -1 lines
Diff to previous 1.30 (colored)
pledge "stdio rpath wpath cpath fattr inet" after chroot and such appears to be good enough for the main loop processing.
Revision 1.30 / (download) - annotate - [select for diffs], Tue Oct 6 06:03:11 2015 UTC (8 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.29: +2 -2 lines
Diff to previous 1.29 (colored)
do not need ioctl.h
Revision 1.29 / (download) - annotate - [select for diffs], Thu Aug 20 11:28:15 2015 UTC (8 years, 9 months ago) by dlg
Branch: MAIN
Changes since 1.28: +6 -14 lines
Diff to previous 1.28 (colored)
use SOCK_NONBLOCK when making a socket instead of ioctl FIONBIO. for guenther@
Revision 1.28 / (download) - annotate - [select for diffs], Mon Jul 20 04:28:03 2015 UTC (8 years, 10 months ago) by dlg
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE,
OPENBSD_5_8
Changes since 1.27: +20 -24 lines
Diff to previous 1.27 (colored)
tweak the /etc/random.seed interception so it provides a FILE* via fmemopen for the rest of the code to chew on, rather than having special casing for seed generation in the sending code. this also means our fake random.seed files will get proper netascii encoding by being read via the fgetc api instead of directly from a buffer. ok deraadt@ mcbride@
Revision 1.27 / (download) - annotate - [select for diffs], Sat Jul 18 05:32:56 2015 UTC (8 years, 10 months ago) by mcbride
Branch: MAIN
Changes since 1.26: +31 -11 lines
Diff to previous 1.26 (colored)
Have tftpd provide a block of random data when clients request the file /etc/random.seed. This allows netbooted systems to inject entropy early in the kernel start. pxeboot requests it already, so no configuration or change is needed on the client side. ok deraadt@ beck@
Revision 1.26 / (download) - annotate - [select for diffs], Fri Jan 16 06:40:22 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_7_BASE,
OPENBSD_5_7
Changes since 1.25: +6 -7 lines
Diff to previous 1.25 (colored)
Replace <sys/param.h> with <limits.h> and other less dirty headers where possible. Annotate <sys/param.h> lines with their current reasons. Switch to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc. Change MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where sensible to avoid pulling in the pollution. These are the files confirmed through binary verification. ok guenther, millert, doug (helped with the verification protocol)
Revision 1.25 / (download) - annotate - [select for diffs], Wed Dec 17 22:23:33 2014 UTC (9 years, 5 months ago) by tedu
Branch: MAIN
Changes since 1.24: +2 -2 lines
Diff to previous 1.24 (colored)
the easier way to put a buffer on the stack is to put it on the stack, not with alloca(). found by dickman; ok kettenis
Revision 1.24 / (download) - annotate - [select for diffs], Tue Nov 25 23:52:09 2014 UTC (9 years, 6 months ago) by dlg
Branch: MAIN
Changes since 1.23: +24 -5 lines
Diff to previous 1.23 (colored)
evbuffer_read and evbuffer_write are wrappers around read and write, so you have to check their return values in the same way and handle errors the same way. returning 0 from evbuffer_read means the other end of the socket has gone away. we should try again on both evbuffer_read and evbuffer_write if we get EAGAIN or EINTR. ok millert@ bluhm@
Revision 1.23 / (download) - annotate - [select for diffs], Wed Nov 19 11:48:39 2014 UTC (9 years, 6 months ago) by dlg
Branch: MAIN
Changes since 1.22: +6 -3 lines
Diff to previous 1.22 (colored)
move to stravis so doug@ will stop laughing at my misuse of strnvis. ok doug@ millert@
Revision 1.22 / (download) - annotate - [select for diffs], Wed Aug 13 17:41:58 2014 UTC (9 years, 9 months ago) by tobias
Branch: MAIN
Changes since 1.21: +2 -1 lines
Diff to previous 1.21 (colored)
Always call freeaddrinfo after getaddrinfo. ok dlg@
Revision 1.21 / (download) - annotate - [select for diffs], Wed Aug 13 01:03:56 2014 UTC (9 years, 9 months ago) by dlg
Branch: MAIN
Changes since 1.20: +6 -6 lines
Diff to previous 1.20 (colored)
use errc instead of juggling errno values in tftpd_listen.
Revision 1.20 / (download) - annotate - [select for diffs], Wed Aug 13 01:00:16 2014 UTC (9 years, 9 months ago) by dlg
Branch: MAIN
Changes since 1.19: +3 -3 lines
Diff to previous 1.19 (colored)
setsockopt sets errno on failure, so we can use err instead of errx when handling the error.
Revision 1.19 / (download) - annotate - [select for diffs], Mon Apr 21 04:02:52 2014 UTC (10 years, 1 month ago) by dlg
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE,
OPENBSD_5_6
Changes since 1.18: +2 -2 lines
Diff to previous 1.18 (colored)
th_code is in network byte order
Revision 1.18 / (download) - annotate - [select for diffs], Tue Nov 26 21:47:16 2013 UTC (10 years, 6 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_5_BASE,
OPENBSD_5_5
Changes since 1.17: +3 -3 lines
Diff to previous 1.17 (colored)
unsigned char for ctype
Revision 1.17 / (download) - annotate - [select for diffs], Tue Nov 12 22:27:13 2013 UTC (10 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.16: +6 -2 lines
Diff to previous 1.16 (colored)
ensure there are prototypes
Revision 1.16 / (download) - annotate - [select for diffs], Tue Aug 13 12:39:02 2013 UTC (10 years, 9 months ago) by dlg
Branch: MAIN
Changes since 1.15: +3 -1 lines
Diff to previous 1.15 (colored)
when handling puts from a client (ie, tftpd is writing a file to disk), we maintain the client state after we've finished writing the file in case the client loses our ack of the last write. unfortunately we didnt close the file we'd just written when we knew it was finished, but only after we clean up the client state after that wait. because we use FILE stuff to write the file out, its likely some io flushed to disk until we finish that wait and close the file as part of cleaning up the client state. if something is coordinating a bunch of uploads and expects the file to be there after the client is happy its there, this can be "not good". this closes the file after we know its finished before proceeding to hang to handle lost acks to the client. found by and ok henning@
Revision 1.8.4.1 / (download) - annotate - [select for diffs], Wed Jun 12 10:34:18 2013 UTC (10 years, 11 months ago) by jasper
Branch: OPENBSD_5_3
Changes since 1.8: +12 -12 lines
Diff to previous 1.8 (colored) next main 1.9 (colored)
errata for a DoS found by Maxime Villard. inability to oack would cause tftpd to segfault due to a double free when it tried to clean up. ok sthen@
Revision 1.15 / (download) - annotate - [select for diffs], Sat Jun 1 21:06:39 2013 UTC (11 years ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE,
OPENBSD_5_4
Changes since 1.14: +3 -3 lines
Diff to previous 1.14 (colored)
use the standardized names instead of S_IREAD and S_IWRITE ok guenther dtucker
Revision 1.14 / (download) - annotate - [select for diffs], Tue May 7 00:26:34 2013 UTC (11 years ago) by dlg
Branch: MAIN
Changes since 1.13: +2 -2 lines
Diff to previous 1.13 (colored)
getpwnam doesnt set errno on failure, so use errx, not err, to say it failed.
Revision 1.8.2.1 / (download) - annotate - [select for diffs], Thu Mar 21 05:20:32 2013 UTC (11 years, 2 months ago) by dlg
Branch: OPENBSD_5_2
Changes since 1.8: +12 -12 lines
Diff to previous 1.8 (colored) next main 1.9 (colored)
errata for a DoS found by Maxime Villard. inability to oack would cause tftpd to segfault due to a double free when it tried to clean up.
Revision 1.13 / (download) - annotate - [select for diffs], Sun Mar 17 09:48:36 2013 UTC (11 years, 2 months ago) by dlg
Branch: MAIN
Changes since 1.12: +6 -7 lines
Diff to previous 1.12 (colored)
i missed the bit of maxime villards diff that took the client_free out of oack on error. his fix is better, so this marges all of it in.
Revision 1.12 / (download) - annotate - [select for diffs], Fri Mar 15 13:13:10 2013 UTC (11 years, 2 months ago) by dlg
Branch: MAIN
Changes since 1.11: +2 -2 lines
Diff to previous 1.11 (colored)
let oack use the full buffer space to build its packet, not just the size negotiated for data tranfsers. this lets people negotiate 2 byte transfers with other options too if they want. im looking at you Maxime Villard.
Revision 1.11 / (download) - annotate - [select for diffs], Fri Mar 15 12:52:03 2013 UTC (11 years, 2 months ago) by dlg
Branch: MAIN
Changes since 1.10: +3 -3 lines
Diff to previous 1.10 (colored)
"correct" the order of calloc arguments.
Revision 1.10 / (download) - annotate - [select for diffs], Fri Mar 15 12:36:11 2013 UTC (11 years, 2 months ago) by dlg
Branch: MAIN
Changes since 1.9: +3 -3 lines
Diff to previous 1.9 (colored)
fix up some lwarn()s that should be lwarnx()s
Revision 1.9 / (download) - annotate - [select for diffs], Fri Mar 15 12:20:11 2013 UTC (11 years, 2 months ago) by dlg
Branch: MAIN
Changes since 1.8: +11 -10 lines
Diff to previous 1.8 (colored)
fix a huge bug in tftpd. there was a double free if an option ack failed. if oack fails, the client gets freed, then the oack caller tries to free the options which were just freed. found by Maxime Villard who provided a fix. unfortunately his fix still had a double free but it was pretty close. ok MALLOC_OPTIONS=S
Revision 1.8 / (download) - annotate - [select for diffs], Fri Jul 13 02:31:46 2012 UTC (11 years, 10 months ago) by gsoares
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE,
OPENBSD_5_2_BASE
Branch point for: OPENBSD_5_3,
OPENBSD_5_2
Changes since 1.7: +7 -7 lines
Diff to previous 1.7 (colored)
zap trailing whitespace; no binary change ok dlg
Revision 1.7 / (download) - annotate - [select for diffs], Tue Jul 10 07:25:37 2012 UTC (11 years, 10 months ago) by dlg
Branch: MAIN
Changes since 1.6: +63 -1 lines
Diff to previous 1.6 (colored)
fix the last outstanding functionality difference i could find between libexec and usr.sbin tftpd. libexec waitied around after finishing a wrq in case our ack for the last write from a client got lost. this does the same dance, or an arguably better version of it compared to libexec tftpd.
Revision 1.6 / (download) - annotate - [select for diffs], Tue Jul 10 07:21:34 2012 UTC (11 years, 10 months ago) by dlg
Branch: MAIN
Changes since 1.5: +89 -19 lines
Diff to previous 1.5 (colored)
libexec/tftpd handled the case where we'd get an ack for the previous block by flushing the data on the socket and waiting for a retransmit by timeout to occur. my stuff (usr.sbin/tftpd) had XXXs and failure in those places. this diff fixes that. this should address the problems that sthen and jcs have been having (and which i was finally able to reproduce here). it also avoids reusing the clients buffer to both send and recv frames. we recv onto the stack now so retry always sends what we originally built for the peer. tested by and ok jcs@ sthen@
Revision 1.5 / (download) - annotate - [select for diffs], Thu Mar 15 07:18:35 2012 UTC (12 years, 2 months ago) by nicm
Branch: MAIN
Changes since 1.4: +2 -1 lines
Diff to previous 1.4 (colored)
Add sys/queue.h. ok dlg
Revision 1.4 / (download) - annotate - [select for diffs], Wed Mar 7 22:24:01 2012 UTC (12 years, 2 months ago) by dlg
Branch: MAIN
Changes since 1.3: +3 -3 lines
Diff to previous 1.3 (colored)
dont mix code and declarations.
Revision 1.3 / (download) - annotate - [select for diffs], Fri Mar 2 16:39:22 2012 UTC (12 years, 3 months ago) by jmc
Branch: MAIN
Changes since 1.2: +2 -2 lines
Diff to previous 1.2 (colored)
tweaks;
Revision 1.2 / (download) - annotate - [select for diffs], Fri Mar 2 04:51:21 2012 UTC (12 years, 3 months ago) by dlg
Branch: MAIN
Changes since 1.1: +6 -9 lines
Diff to previous 1.1 (colored)
CFLAGS+= -Wall -Werror and the resulting cleanup
Revision 1.1.1.1 / (download) - annotate - [select for diffs] (vendor branch), Fri Mar 2 04:43:13 2012 UTC (12 years, 3 months ago) by dlg
Changes since 1.1: +0 -0 lines
Diff to previous 1.1 (colored)
a persistent event driven tftp daemon. because tftpd out of inetd doesnt cope with a lot of concurrent requests. ok deraadt@ krw@ henning@
Revision 1.1 / (download) - annotate - [select for diffs], Fri Mar 2 04:43:13 2012 UTC (12 years, 3 months ago) by dlg
Branch: MAIN
Initial revision