From nobody Wed Feb 18 00:15:14 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 4fFxq64CvBz6SL2q for ; Wed, 18 Feb 2026 00:15:14 +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 4fFxq618SFz3FNC for ; Wed, 18 Feb 2026 00:15:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771373714; 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=lOZ5dg44nUdhATWxcwtiyOZJUc7wkQ9en2YpDTnRmbU=; b=L+4vwVwjjuPRrEkk61ZWWWY5DJR7KI+Ht4nVGB5rorbgMAr1maot+ArJpLzHPt74m38Y5r iNf1oujxIlK5pP1qxt73vhD0zQtGWg+9IbP+szOta5Bs3mwFf4kTJ+QFfTB6wOnT5YiQlZ x09elZ8C0mXTCBCPcT+UZ1RYx5/SOoEMMA0oR+odwMHM9ARRh/UEpV6ymmBatCPPHpGs08 UYNmOZx/I8PufvvfB4F9rx/JYbY/JsmvhrPggIPImNhQlv307YopDcLrzlbvRYsEEvqnft V7Tb3DIcBIO0ESgrMjE7TZLS7n8l4ZNBa1YzMbTql3od0MdCJCcTX//2za4IWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771373714; a=rsa-sha256; cv=none; b=Ve6CGsVGw0H763d10l2L8iSkcPSAgB1JlBSkGAH0PMcDeH4KpdBvz9pDOTop1Pjl/mYvNL hZveyNAHR0Ub1WkxPxfxXKVbiAjjsUC/pQHj2xaZsO0TFka3cwLIteun+0GUgT1aYlHRXD zsw3fQrhRg7RR7TOWzv5XTolaNMJnfQcaMX6YK+VzJBbXHV8GmpwKEij1GOy4/jddbBcnU qBZSc6E4/73/OWQwj2ojdCxLmxzsjG3xfbHDEEeAxSZQaW56rQn8YSlc5rsUri3fJfxFWm PRNhhb/LdGD0E0yK4oH3tv2TvWnK2tq3XG48f+okKdu2Ax0ZFMYUHUyfarkiog== 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=1771373714; 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=lOZ5dg44nUdhATWxcwtiyOZJUc7wkQ9en2YpDTnRmbU=; b=hGUxnUz1C/OvjLz6qCEjqJivqszonjQy8cDavtNbHpOEwyuwFOJZatV53I5bHAOvaQGCBQ ESO/zHvFKTyvSSKEKE9vm09AmgXBYgCfRdfFiLj66PvwEzqzqovPdaF8vIZIITbUevrDpU ckM/5Q1zkojgsG2p3KXU4gSK26UEq+2yvcxcFZNeRzVMTgmhxCUB70a9S0K0OU8K4uERDv zt/O+5WudC1+2iNNltj+KpfZiSnTEq7xbf46fDAWvDeGdkOIBX0wjqxX8s7s1jpaGGyNjo UE0D3iVpqDUG8rmgZt05yM2iMToxofjTn4potIorUNSp2hZxluDQLCF3vhnG3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFxq60lnWzXjf for ; Wed, 18 Feb 2026 00:15:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d5d4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 00:15:14 +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: cff16d69d751 - stable/13 - 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cff16d69d75151e280a83695f52db608bab51a49 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 00:15:14 +0000 Message-Id: <69950492.3d5d4.43402850@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=cff16d69d75151e280a83695f52db608bab51a49 commit cff16d69d75151e280a83695f52db608bab51a49 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 15:57:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-17 23:12:13 +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) --- 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); }