git: 7e3a60f2d469 - stable/15 - tftpd: Keep proper track of header length

From: Dag-Erling Smørgrav <des_at_FreeBSD.org>
Date: Mon, 16 Nov 2026 15:17:43 UTC
The branch stable/15 has been updated by des:

URL: https://cgit.FreeBSD.org/src/commit/?id=7e3a60f2d4698084f519c9141e0ba2cf53ab3009

commit 7e3a60f2d4698084f519c9141e0ba2cf53ab3009
Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2026-11-11 19:45:18 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2026-11-16 14:52:03 +0000

    tftpd: Keep proper track of header length
    
    When parsing a header, keep track of the length of the unparsed portion
    and pass that to get_field() instead of the length of the entire header.
    
    Reported by:    n0ps1ed
    MFC after:      1 week
    Reviewed by:    markj
    Differential Revision:  https://reviews.freebsd.org/D60902
    
    (cherry picked from commit 579e428a551a11b43e341297dd0ef9d38c4fcda7)
---
 libexec/tftpd/tftpd.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c
index a3faee86e7d0..939f27b9224f 100644
--- a/libexec/tftpd/tftpd.c
+++ b/libexec/tftpd/tftpd.c
@@ -459,23 +459,24 @@ parse_header(int peer, char *recvbuffer, size_t size,
 	char **filename, char **mode)
 {
 	struct formats *pf;
-	char	*cp;
-	size_t	i;
+	char	*cp, *end;
+	size_t	len;
 
 	*mode = NULL;
 	cp = recvbuffer;
+	end = recvbuffer + size;
 
-	i = get_field(peer, recvbuffer, size);
-	if (i >= PATH_MAX) {
+	len = get_field(peer, cp, end - cp);
+	if (len >= PATH_MAX) {
 		tftp_log(LOG_ERR, "Bad option - filename too long");
 		send_error(peer, EBADOP);
 		exit(1);
 	}
 	*filename = recvbuffer;
 	tftp_log(LOG_INFO, "Filename: '%s'", *filename);
-	cp += i;
+	cp += len;
 
-	i = get_field(peer, cp, size);
+	len = get_field(peer, cp, end - cp);
 	*mode = cp;
 
 	/* Find the file transfer mode */