From nobody Fri Feb 13 16:01:43 2026 X-Original-To: dev-commits-src-main@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 4fCH3X3bGtz6S3H2 for ; Fri, 13 Feb 2026 16:01: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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCH3X0074z3jR1 for ; Fri, 13 Feb 2026 16:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770998504; 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=HzXEVrx70gFpSRvQYRNhGXMCdC70lAMaAkQYoVwQa/k=; b=FvRyeMzho2nSZmT+Ru2f+9c9ItYtb0AMkLopXegMDUJnfP8YTDUuTeZaGK/swjPjIWQJap j0Zu1saSz1fSU8i5wv49AdWIeamYU47BgWmJc6/73FLIHacxYIsYWItAZ/4csqS8zMXhN9 e5V4I8uIPzCY2Q4pOV0/PG8qPx3CO2xUAHqd8FYWNcUQOyoPajYPhNMzvqTZxxS2UOp3zU DYbWKfhgfDWEZBSYmRBHbHoIYhkIpSZBNSxt+PnQa4qBXTk/blt0meEeNX6QlwA7LzOalC PMY+tWFF4/iMJ2vsk7jqlcNv8Xft8U6eYYGfi5xzwcaxLwJJQdfpUagI2rrxFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770998504; a=rsa-sha256; cv=none; b=sWEJklZZo/i14FG0iySJe7d9Du/jBDuWkUxmTH9mpi8xXE0ryMSGW7I463YvldENkDOs7D cX1pOG/0AB8loTQmudpePoGzI6Cy/K9uBR+mRe3cYe6cirZ0Tgy/gc74ScTrE4HjdYtePX dhILgEWos0wHoqUCLPJ5f+q9WbUc+D1cFvHW7+9Qlsj9Ijq3Vmfp1bIUpm5PPNAfZSqGTz KyEvT5cwpALujoODoBM14xx9X28Ca0OcCrXphfHQEJDbthl3qrpgjc9dCL0Tggp8n1WEyA I9/ZWdqbg9pbAqmI6/IfOZLNaKymRZ4do3sEB4w7Jpecw0BwwZlyFuo1WB5RWQ== 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=1770998504; 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=HzXEVrx70gFpSRvQYRNhGXMCdC70lAMaAkQYoVwQa/k=; b=DzwJNxTvCs+ezUkPgrUP+L5yAI8k+nutCIPjlgCwqzqTSEjT7y8db7TMNGIGz7MCabbS8t J7WmNnQLPatsmFioAyynco/osDya0LCoc8Aa00Wv2gbpi5YrYp7GZ0iZYYvxDWQaqKR/Ib ewWY7Bj7A9L+Uat5uI11P6epaAdE6GxRP5c4BWHk0X+wDt0+hf8M7OtEkYPoFFtASy7JtO lNYRiZwUeKgxnZj+crPj7qIFdp36Y9FCgWYyBQ9XIWAupepVvtX8a+vzBNEaUqk3X+K3yW GdW5npu5H9KojubisfUL5eYXe53ftuh2hEe8+KyK0AAHEWYob9Ldx2iuZkh3pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCH3W6htjzCs3 for ; Fri, 13 Feb 2026 16:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 229b0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 16:01:43 +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: 585190dff436 - main - ngctl: Check hook name length List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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: 585190dff436eeea3be97300e36c82559028d3dd Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 16:01:43 +0000 Message-Id: <698f4ae7.229b0.495b63f2@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=585190dff436eeea3be97300e36c82559028d3dd commit 585190dff436eeea3be97300e36c82559028d3dd Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 15:57:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-13 15:57:58 +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 --- 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 98bf213a2dad..b86533eca49c 100644 --- a/usr.sbin/ngctl/write.c +++ b/usr.sbin/ngctl/write.c @@ -34,10 +34,12 @@ #include #include +#include #include #include #include +#include #include #include "ngctl.h" @@ -62,6 +64,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; @@ -71,6 +74,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) { @@ -103,11 +114,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); }