From nobody Mon Nov 16 15:17:42 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 4jSs1M22C8z70rQw for ; Mon, 16 Nov 2026 15:17:43 +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 4jSs1M18SDz4QkW for ; Mon, 16 Nov 2026 15:17:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794842263; 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=9+/7ATswrOimTwU08zffLsxOlXvrznTCX0vqPUTfSUg=; b=buWm0v6F7Ndag1x9odB+p9bm+zib9rLh3rTw9EmSEu6s829wq+y8qsQaEiGr826nnvl993 M6l723QUi1H3xTtB3v9jCzb6gjbou+8OhK7nycxCY1TBTA/N2Qz/DTxEVH28SStRwAJfBA ZvylgorUk3NeXUgiPFCCuAoucrbAmR1LmT5di1l59AlokG/bKT52sgADONCyQTLwSWUET1 9UePxv2KHYtbu6zbYZ45LHGNmES4KYxTvWJ97ekTrNDe+IGuoSpoF8a+z7PC59WPsDQ/rE aGyF8TOh0N1j3qeRP4WM7qQUVFTG55QxTeP0gol416bF3PY3cJojU1L7uWH4Gw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794842263; b=tvdWWix4uqSaa3bMKn7jwkyQM/JVSRj9Mua6uzFvhUDTsIRHzq8Uh6sVxGrZ0lTSgvY0gN RJ/oUoDHXkBKAvQorbSAXOqVJR42ekWQADgGUPZ21ZeRAtjxxuHY0LkmE0koBayUp0CCR1 0jslI19D5sZd4JEjJ4UoxjFG0X1C3rB82Q3M8YIanaNhvUZR/rPahnT5yN5sKw2vzNrcKh oH85KHkG+wjRme+wYv5VbOAmhmwARo3baIc3rXPFqTeCrsk4lyiiAdIR5Hhq8+oCS9zm+k ORQCSIKlDQTBxOba1Ijz1hp6c8or2U4FeI0PJUEe9f94mTYNsnf5I7AhPgS2eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794842263; 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=9+/7ATswrOimTwU08zffLsxOlXvrznTCX0vqPUTfSUg=; b=UIY+6+8lO3tOVoPSSvqheqce2xZXnwhPsrD7Pj5HIbB+zvPCF+MhfVWSopPZtQAc2fONNL DCWFizz1apPL9CLe9yneKkw48UOaFv48mw0pqKM3yhiUXSm/ItbHVT1OauInVyztEF97/b V/r5Lv1OuybRBbfJ2GSCSH2/cuPr1dj/WO0JybUUFkFZery7FXwgaBDJih4ss+56SUmfNv 1nHdp9QIvW+96oEr4Vw6n7wRivvH0zOLiGoPdvneBmywu8kK6DmftUN+x8lpkcIsh+QPb5 TE+OCM+hzFA4juR2+7+S/TfLb+X2bgyZeXOnju9Xkd8VzNH96+rTWTKP5aB5Iw== 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 4jSs1M05hfz10KK 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 49b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 15:17:42 +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: e30c4d435d98 - stable/15 - tftpd: Fix off-by-one in get_field() 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: e30c4d435d98413a6d0296295c0b81016afdb8ee Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 15:17:42 +0000 Message-Id: <6afb1e96.49b3.415f17f1@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e30c4d435d98413a6d0296295c0b81016afdb8ee commit e30c4d435d98413a6d0296295c0b81016afdb8ee Author: Dag-Erling Smørgrav AuthorDate: 2026-11-11 19:45:14 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-16 14:52:03 +0000 tftpd: Fix off-by-one in get_field() Due to a logic error, get_field() would behave as if the passed-in size was one greater than it actually is. Fix it so it always fails if no terminating NUL is found within the buffer, instead of succeeding if the first byte past the end is a NUL. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D61032 (cherry picked from commit 14541ca2bf3766e659a22c5ea9ed3dc2d5f11fa5) --- libexec/tftpd/tftp-utils.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libexec/tftpd/tftp-utils.c b/libexec/tftpd/tftp-utils.c index 8ce7c09c9992..9cda798462e6 100644 --- a/libexec/tftpd/tftp-utils.c +++ b/libexec/tftpd/tftp-utils.c @@ -109,16 +109,15 @@ get_field(int peer, char *buffer, size_t size) { char *cp = buffer; - while (cp < buffer + size) { - if (*cp == '\0') break; + while (size > 0) { + if (*cp == '\0') + return (cp - buffer + 1); cp++; + size--; } - if (*cp != '\0') { - tftp_log(LOG_ERR, "Bad option - no trailing \\0 found"); - send_error(peer, EBADOP); - exit(1); - } - return (cp - buffer + 1); + tftp_log(LOG_ERR, "Bad option - no trailing \\0 found"); + send_error(peer, EBADOP); + exit(1); } /*