From nobody Mon Nov 16 15:17:43 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 4jSs1N30Wfz70rTD for ; Mon, 16 Nov 2026 15:17:44 +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 4jSs1N0FYYz4R1c for ; Mon, 16 Nov 2026 15:17:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794842264; 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=hncOV7lfzhv56VcAkCckXc9MbPveUaXXrCXNwlv/OE4=; b=JmuoRL1KjhQtad1LhgS2uN+yHr58aMDy96R1bd6CFgB3sr3G+NwM3jevaXVywREJHNomzr rhuzf6E28DqDGrTdvqE80b8Ab0/XXV0pYL+i6Vsiz+LPAurTZp7NeBpqu5n/y9G0pkW7pC W94fMwzFWLZQ5CcaHPkAQAv0GgDiKHe96ZRwiIqagG9Rk0H9BD2z6hvqwLRae8GBJphm6Z 9YAWWm94tCOzJDmftoJtS1aWEaFIC+cCvBJg0l+HTTH7kPpiTUusIdebj6Ov+0M6m92mOZ m+kTZEXVd92RnLzwSeLfg6VRVECaXsytcZZli0PTegnd65rHkqBCtXBFFB4A7Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794842264; b=K8uj2n3Os97My6UdLieY7VAFEVT5NBJGPQQMrTpQB8pmygNA8aDdJhMWUH9EEDtaDYeLX/ CZtCLBwjx9ZtUmzZdcpgS5xn5WIUtc4KKFcfdWLKKu14/A13IeOK3MuGewRmV1y6IJRFVS nS061s9LL9ww7tOtCGpY87cYLEKwR+OhywshPUT/MPbtfblc7HYCe1UYIRHJvv6Dh+vRQw LaBzfIUraHlH/wgV1Cbdb2G8ipPScSvHyLQgYhUP+xf+JCWNa0FZ0c7nB5oLA1aC4yTcHY 19Yvgv/tOsa7EmdgJDCxIdDcRxvy4GEjrZQJZVzxBO9/wzaAIfpTroblPfQXgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794842264; 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=hncOV7lfzhv56VcAkCckXc9MbPveUaXXrCXNwlv/OE4=; b=pObOmtQv/SqxSmEnSIiz4sSPSKdaRAPGM39WlB6rCWt60ZC4jSAqaXL0i45G2xVsrtEglG WYF7+C4tFMwFY7bI0ax6Lz1fpHJk5dWDoTHAE98CDU2y568PhEnb6UtrRvb9/+GL/8roKP USpsgY4SBTVAzfPVKCctPZ6vHWqL6APYSBBzWEy50C1Qwd12NIoaSr56QwPhkPXvZk+ZU+ zl2hYy8W214CfXM3XUAOWttH6+Cpbfr3TVClVk8UATbCw4YMPxtpIX9ky3fxF17NTeW+1s nQEwQrLgXlvX1xS2eR/u4J+RUVfEp/peQdzSxfx9jiLnW22ZL/pLdaeiXTXefQ== 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 4jSs1M72bRz10KL for ; Mon, 16 Nov 2026 15:17:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 5581 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 15:17:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 7e3a60f2d469 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 7e3a60f2d4698084f519c9141e0ba2cf53ab3009 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 15:17:43 +0000 Message-Id: <6afb1e97.5581.30162ff9@gitrepo.freebsd.org> 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 AuthorDate: 2026-11-11 19:45:18 +0000 Commit: Dag-Erling Smørgrav 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 */