From nobody Mon Nov 16 15:17:55 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 4jSs1b5rvsz70rCf for ; Mon, 16 Nov 2026 15:17:55 +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 4jSs1b2wFxz4RVP for ; Mon, 16 Nov 2026 15:17:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794842275; 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=9tZY8NdtE04GuJAmIKC1VkP7CyA7d1q3OAAqqGX5vtM=; b=vomDFormoKI/A8LSk4AA5T/3Ybj4tRTE1Y1XEgGObpheCUAsNchYcg+m37Ne5bzDs0Wo7p O+CS05qJ3/+q0OpKFcNjjFYFGp424XfBEoIv+0s3c+qYW/oiXkoon//NwFwxbJyniOROqJ ntn1DDwSXvsKqE+4tj7ncXC/qJFaGfS1QZwRVj4kbrlhsENK8uLGsthrIai/VBgzmOmkgl FxKi0nvo2rjFV0tCjVBB5zkioy0rbhLD2GKTJERRoM/sAP+6nABBnPszsKbU5r4t4AOV0q 2ET6AusoYazsJH4H1RtkMEGSUyxSamSFMMt6us0c6w8Zg0JOW3DtxbWx43Lllg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794842275; b=XcZmkvwnTn0+VLc4sHfdy3jtHmgNqHTkDzReNhzVwpFETR7UnQQYyHq2FNSjiu012nRsIK lJobefyzrOnNV9Mv3jp3GQQHH1dlg8ZlFNc2LWcg1vunA0bUNdqXONTqisWmQ9F9lAKYpm XBZMS8slFraJ2n28OlMMOm59LDKnj/PQ5X1akZRARTcx2d0u8EVdvQijAfOq7NfdCG8x0K Q0kVxZHPxpi9N47RRC2i9ZQj3Fdbk0yP10Nqs4QW0/ocZN+0Efv3ip98EyiwLaBdLZuNWG 5pz5tKX4trfhIEMgZSTckbszVw9u/iwUD5hA5//ybvD2c4xj1wmDtiLk5kt7IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794842275; 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=9tZY8NdtE04GuJAmIKC1VkP7CyA7d1q3OAAqqGX5vtM=; b=VxDW0o1sCKQDjP7eppXgxHEEcSNzK0gOmDMHGTAceRAe4+5tW2oXXK3YCOGsxsE+rszvYu et+UxRTN6pKylVaIGH8AH9oEVoUOHC3R0RAyeAhpKX/ukxqc+AaAf+iJl5jNTrPLXQ7Dl4 D89PNOHq3rRfMZEW/lWLBNFcw5QR61l/dACSbSn5Bcw6GyLpaMQfVMT6b0kYRMwcCOpNaB sTswq1I7vHMeDlLiu0g+0qfY6i851QWLwHfY8++K+nWeQ2qBSgO39pYwlgf/5av54QZ+LK ix1VYPPKMcmWnQkfJjgXuOkRzILtWeGbJmlSTTC9XIK6MnzflJkCchkW64D+rA== 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 4jSs1b2ZzXz10KQ for ; Mon, 16 Nov 2026 15:17:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3275 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 15:17:55 +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: 5d0e1aee4c52 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 5d0e1aee4c52d2cf3959263cf3b777785ac038a1 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 15:17:55 +0000 Message-Id: <6afb1ea3.3275.5ca89c60@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5d0e1aee4c52d2cf3959263cf3b777785ac038a1 commit 5d0e1aee4c52d2cf3959263cf3b777785ac038a1 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 d27054b757f8..43e892f605bf 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -471,23 +471,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 */