From nobody Wed Feb 18 01:53:07 2026 X-Original-To: dev-commits-src-branches@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 4fG0036KkXz6SSlh for ; Wed, 18 Feb 2026 01:53:07 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fG0031Xgdz3QmP for ; Wed, 18 Feb 2026 01:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771379587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ChxpwPYWreHrJ9QNn8iLXw6Y174q0ViCiW2BDLcIjKk=; b=TL4kiUR/ggnzp7u7WlNStqEEoaxedH7nTvI/kecNfFn0n/eDLqtbtxw4beg6PxUch5HGO/ cgBQOHSwNXKyq5k1WO3jWjv8tVVP79X+bvosiz9uE7iXM3yL43Zc0iD47CpTKm7h9qCqH5 Qyr7AUwPT5gdCmk+/+ZeECQA2mwZLGkkVPjge+P1jP3ateT5m5xTCi3uG93K3yPu3/lGAu aaVcNG8kXbR4MDf0PBz6YK0MDWH6/98scHPjwZo+Erdc/+9Ra637yzLvVeF9EPgCPHb/rh 9l41KeDjtDUoIIz21Aom2S97SJVjkbVQ+35zn2icaFxxx94RwzwHQipAuS+hrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771379587; a=rsa-sha256; cv=none; b=AXgqtv8JoWie35YLUfNyw7iM0nhMWWCgRuhCa7qAD4wwPPXwpYhmbAo++D3LH7hXVbDkoM tZzy5wZOpjhdVuiwz1EY84h+uPYhp4vl5DwT1YNc0v3+QP5WAdejOVFACOB8pXH7q0gBFS 6QTRbMZe1RRysPYFs7+9LtarelUfaVO4snjZAgHIWaV8MeY3dqnHnVwaNHBI3U96gcMJoc rjVl7nDmSEyNvH42Wxa+fZc8QgkgTR/25k1MFh5J0O/k5oupplRMsrfHYGucjCJ2YmfiK1 tU7XxVZhEbA1c74v6/MHAhLY/ieaTnSt+aD6iNaWwbM4g89h48pDGB5AGk7GUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771379587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ChxpwPYWreHrJ9QNn8iLXw6Y174q0ViCiW2BDLcIjKk=; b=sKnwYPEN0PBLJelnTTlxjqIgcIrbVHVxQATzKUeeXnoVQOYPPXitbOG2EmYVey7aWKeUXY D6zoreTeUnw0EQCxBPA08mFQPLEjB0Oj75eHvkd+uiPAI/j24MH5buL7dcCuhib2wJUkX3 fjkQDytmIXHFPzo2cxVb9zj3XRVv7Hfz9Thdu/fWn/JdJLnsyjIrx/q95e8uSP3ZqLFp6J 9W9sxj3TQb/4/OfWDTAIVNUPMC3eO+UtwCz6XAR0QghFHihJgYpH5zGRRNbmYgG9LBPMbS GZWvL9ImYFsf8nxrCDFcsw1z56tXcrRYjZoUQ3PbLVaPhrZ8g0M9kO3+tKy2dA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fG0030VKYzcKH for ; Wed, 18 Feb 2026 01:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 457ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 01:53:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: Colin Percival Subject: git: 6316ab68d331 - releng/14.4 - ngctl: Check hook name length List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 6316ab68d331098749ad1eac63a183a4c9ccda3c Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 01:53:07 +0000 Message-Id: <69951b83.457ff.8656ec9@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6316ab68d331098749ad1eac63a183a4c9ccda3c commit 6316ab68d331098749ad1eac63a183a4c9ccda3c Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 15:57:46 +0000 Commit: Colin Percival CommitDate: 2026-02-18 01:48:33 +0000 ngctl: Check hook name length Check the length of the hook name when copying it into the sockaddr. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55258 (cherry picked from commit 585190dff436eeea3be97300e36c82559028d3dd) (cherry picked from commit 71c0f48ab19fbac3d93e29d8964db2f215ddf722) --- usr.sbin/ngctl/write.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ngctl/write.c b/usr.sbin/ngctl/write.c index 1e86963fb39c..7ee8dcfaa241 100644 --- a/usr.sbin/ngctl/write.c +++ b/usr.sbin/ngctl/write.c @@ -35,10 +35,12 @@ #include #include +#include #include #include #include +#include #include #include "ngctl.h" @@ -63,6 +65,7 @@ WriteCmd(int ac, char **av) struct sockaddr_ng *sag = (struct sockaddr_ng *)sagbuf; u_char buf[BUF_SIZE]; const char *hook; + size_t hooklen; FILE *fp; u_int len; int byte; @@ -72,6 +75,14 @@ WriteCmd(int ac, char **av) if (ac < 3) return (CMDRTN_USAGE); hook = av[1]; + _Static_assert(sizeof(sagbuf) >= + offsetof(struct sockaddr_ng, sg_data) + NG_HOOKSIZ, + "sagbuf is too small for NG_HOOKSIZ"); + hooklen = strlcpy(sag->sg_data, hook, NG_HOOKSIZ); + if (hooklen >= NG_HOOKSIZ) { + warnx("hook name \"%s\" too long", hook); + return (CMDRTN_ERROR); + } /* Get data */ if (strcmp(av[2], "-f") == 0) { @@ -104,11 +115,10 @@ WriteCmd(int ac, char **av) } /* Send data */ - sag->sg_len = 3 + strlen(hook); + sag->sg_len = 3 + hooklen; sag->sg_family = AF_NETGRAPH; - strlcpy(sag->sg_data, hook, sizeof(sagbuf) - 2); - if (sendto(dsock, buf, len, - 0, (struct sockaddr *)sag, sag->sg_len) == -1) { + if (sendto(dsock, buf, len, 0, (struct sockaddr *)sag, + sag->sg_len) < 0) { warn("writing to hook \"%s\"", hook); return (CMDRTN_ERROR); }