From nobody Wed Nov 11 19:46:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jPvCG3HKcz70g7v for ; Wed, 11 Nov 2026 19:46:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jPvCG0NxQz4Kwy for ; Wed, 11 Nov 2026 19:46:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794426362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HVxEuKf/lJ8JkoYk2YQYldPRQxLxfD538EWgwtwFXH8=; b=H7Jxzrb/tnxHqnKqHpV9kP/6JCixfva2hmGXzgr0tTYOptt7/Ps3ATD/zUyAxslbbscCaP s+JMxDOB+G0u+2ltEKd8Ja8xvVQ5qEm69bI6s8D5Zt6SqOxIt20W2qqA0gW+7Uqw1Vrm9p Q86dXGPDgVtOffgmDA4SOGWGcYc4aw5cIIrkQXSAKojBUs6Mx44anKwW7izqL7vHcU3XwL 9lbqJNRehS8SIRsKbtGUVYGeMqDFAKkMG44bu7LptoRDeV6aodiiHHPrnpfd39uOSjltFl b5vt68eNnuiLKrxfDLuftnDhVuK0saMidD8TTRjAuJbJWot6PT6jpn6bF6wStg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794426362; b=cq3eDnhdMqGdtBd1wcbFSfYJ2U2tDCBPUpwefpPThICpL3PXnV9Uk51Z1yGKv9Z7i3mtSc vVxQfBuWBrYl/q3wN3ixzVIHDmKJ9p5anQyspUXgX6HrIk/VB7YZBPtYqDJwKlvVFMFzZs qtVLKsIWkEw6XSHoY7VyPRzmQC1gMy9etcqNKnEwoOtotZjzo0US3+QDAQTviE51LLwOQc mDtHiiyOOPmBUBjEPIz5D5bO2tCsuGnwYiatHq0TPcMeSy38P5IYO1krm7vB0smHXxq//j mR2f+fBAqrdB/sNoVAXAzYk8M2xoonOztNV5gumj3ZIK0eM6gb3HKsPHdIMeBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794426362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HVxEuKf/lJ8JkoYk2YQYldPRQxLxfD538EWgwtwFXH8=; b=YGWrCf3NQHjFmRsAGDDM2LVDzEk+ex/JOVlVa8FUUjbAOos9QVenmx2thUttXt77OMlDbb 1WooI2lEPWg03iCW2K1F9UKMiz2aN4GLGUD/hOikuVnYwftdQxDG0Z23Sgti4c7pks3o6L ItFJJOA0mz8GFWdkLeoXjEA0k6bNjx/cgnmUxewTVGn7oGeM6zi6JZWXG8bgskVutos0SL Qxu+H1nWebnQxVZLjlKxYak8QrQ2GzoPmdv2uliUYVe/WpvEe4n1IYQ3bwS8HigUMokIwp kkjo0Xe4KUX+18FIMkZnPrY4SLBW1hU3CRYxQsZQwx+Bpzb8BQB/8Ph+NHe0jQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jPvCG03mgzSy2 for ; Wed, 11 Nov 2026 19:46:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 98e6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 19:46:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 579e428a551a - main - tftpd: Keep proper track of header length List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 579e428a551a11b43e341297dd0ef9d38c4fcda7 Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 19:46:02 +0000 Message-Id: <6af4c5fa.98e6.233cc9bd@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=579e428a551a11b43e341297dd0ef9d38c4fcda7 commit 579e428a551a11b43e341297dd0ef9d38c4fcda7 Author: Dag-Erling Smørgrav AuthorDate: 2026-11-11 19:45:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-11 19:45:18 +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 --- 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 */