From nobody Tue Feb 17 23:57:59 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 4fFxRC6w4Bz6SK6s for ; Tue, 17 Feb 2026 23:57:59 +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 4fFxRC3mcLz4QDF for ; Tue, 17 Feb 2026 23:57:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771372679; 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=CX9rvOaGnZytfwETcSK2k0FIiqlJhZcQLvakQ9G+6Do=; b=kngKTrkyxOLepVPmWLTXHfIARLpt6tXfLOBSCTnPznvuekFWshp1zzyeAvFVhftfOObT6j QafjWAD8CLeTkx06mdbJRue9oKiECXJwsgnxJwrDhZoqJmC+04e1LbJjRO0xcL1NgY1v84 rhlVAGkeyFcxTmOX7LVdbN4yUDtFWLyq/oHG4x5kYr6p+M88MO2Fg6OEPk5imiVi4X1IwC LT4QVw9SbxOKEImByUOaUOHmh+HUeZ0cSnb3EE2OCwi4cHLpC8zbkMKsRQ5d9PbDhPqQKT UA/+nkkNCl8+pR2wYx9zvz6C71rctM63vu+VCM+8cggjQyXBZw1Y+Nd95TKWDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771372679; a=rsa-sha256; cv=none; b=nIufvRIqkHPHbDHhFz0YKwytMRcwRxsKdlsiE1bfdDhks15Cl4oKpS3iPkbcS/4UOFCTpm NiCFU9S39vTZgsDkf6I5kBofbiQqhzNjxxWTORLGGcE2n7m0XQdPwXAp2qlLFMEIfYKYLH AR6tiMnz9WCYa1OZrlyZtDZTL/nNiWayEqAO/JBglqg2Ol1YMtPqOB7vqkIpARY7kXwuOI 5ZTx8yMU5vjhB0B+W+KRx+ySEnF3Qgxfp1hRNmPilnbvR217YjatL9wIcJY+4YkCyiEXN2 98SZoXqvVUOAlpz7m4TGQHS0k4oAPDb1rPjrthc6alb3ZIKHKS3KyrFwXW4SMA== 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=1771372679; 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=CX9rvOaGnZytfwETcSK2k0FIiqlJhZcQLvakQ9G+6Do=; b=uZT+eNjf4iNSrC0AmtWXrglWPLwmArfNNcdEsgEJFD6y/HmygOiNUlile3cN28fN59B9uX aWB18w6055zgVZFH2uYonS9u0H9wkMY7JqcLqLe6bpBHOAlVr3LSXxoEDyeyVwXKvvNGxB Imk2oRz96LHk7/vjcydlFXDPGTm+A63+IhJ60iz1edEwLfWeuy9WnelHLJZAPeTO5kEtds J+dlkVlxMJ3EqnR7+2zaRfkKASur2sX1TPe2mgH/kqL0eacC6n8XsJLxVFkWZmtZXchMAi PZVuVtjg9EZcPHz1XI0zUXHhBonkjXfq38ac6Go67rUt5W91U3+wVaRnvBRdwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFxRC3Lk4zWZR for ; Tue, 17 Feb 2026 23:57:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3baa0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 23:57:59 +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: 221c09cab60a - stable/15 - ngctl: Check hook name length List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/15 X-Git-Reftype: branch X-Git-Commit: 221c09cab60a8257b41be9067f1712d77ba828d8 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 23:57:59 +0000 Message-Id: <69950087.3baa0.55b65aed@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=221c09cab60a8257b41be9067f1712d77ba828d8 commit 221c09cab60a8257b41be9067f1712d77ba828d8 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 15:57:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-17 23:11:48 +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 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); }