From nobody Thu Oct 01 19:14:59 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 4hwhSM4pJNz6vXQC for ; Thu, 01 Oct 2026 19:14: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hwhSM4J1kz3Dgn for ; Thu, 01 Oct 2026 19:14:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790882099; 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=dvEHTgF2N/T4QB4+gC9hsFhkJQuQy0gyJ5mKhSpXfqI=; b=Wm1EssErhXKEoVhrjfSiQxqZGyqIywBHg9Trc8TgWvKIV/BDhUEOaSq5OABekUrhMd7pMW hs7qbbA3jhE+aP78j3OrPuASb3rcRF/XP5YYjRQJjH78g3jvZE6cm329igR7h5RhcENJaf +sEpYifvjsufMpskEHsyfjakBhpB/nkgUPnCa9LeJC2XXap/eHQkczMggTYwzyf0vhG4jX l7y9e8ZGU+vkOW8uUEcAapfO+VYtkxsT3QG2oAsyaTT1/oDSKOz+h8grFfoKjrv8DsoDaA tC98lwA96iZVfDGjEmj+anokioZRiTH8GD/eEbR65PcW+Bn0C4i0/swKXhNOlA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790882099; b=U0pjWDtIUEhViJ11J5wB3f+6nqTdoYrpVxUAna678vEvjx5aKFAB2COLzBHv++1ONGHFL+ eJLYVkXnxD+xC/SysakUBO9Pa2IH2klYyrUEJXq1lNHDkFzjXckOqffmTJDZu74KrvhvAa XDkwM/NJ3pindQaPolrdOfmQL7lQJ1PcEn182vfmx1m9yuJbzV38zMXZWWvHth41uo4y2J f6/JKfVN9D4SqQTZniZhdxgTgoXW4YIFC7/sSSq5DeXpJ6PczKI1hsrJXixsnn49kYRBdF 7SytUNNrhBRir1fGkPAoLoADGDEz0EB0K2/2/ueKlP4ViSPSdIVzC5ybVvRJlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790882099; 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=dvEHTgF2N/T4QB4+gC9hsFhkJQuQy0gyJ5mKhSpXfqI=; b=veNwj+JMV2zznhKLZUZHcIuvkTRZlC01FcuqcDnOSAzQ2/B/3aJFpHUmyeVvupTkDtRYm7 IgZAS2di/TXSecWJaG9nQISEu8tLC5KkWmwdh5AumPDUTRDdtrCFlqBzx9ApCe6qoKUl50 LKl7On+4Sp5ZvOqGT4N4tqP21fMHYSeWhpivY72aFbyzPAkzK7b/VLezrAWJXAnr07hIfj nbGLFMSeTb96OBQFDLJKTyV/9MdEgb/66qR1W3t9fnTdYratUNPAEnQDRH5tghb/8kV4gB VwXuo+c9KqqpzJ++8EHLm0+mNQdRGk5QeW+Wy+bAEIU07mzvrqRuSt4cXH3K9Q== 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 4hwhSM3MCSzm6G for ; Thu, 01 Oct 2026 19:14:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 238e8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Oct 2026 19:14:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: e2279d5ba9a9 - main - tcpdrop: improve handling of -C and -S 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 List-Id: 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2279d5ba9a91407239cba4bed80abff73b15798 Auto-Submitted: auto-generated Date: Thu, 01 Oct 2026 19:14:59 +0000 Message-Id: <6abeb133.238e8.69c6ce84@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e2279d5ba9a91407239cba4bed80abff73b15798 commit e2279d5ba9a91407239cba4bed80abff73b15798 Author: Michael Tuexen AuthorDate: 2026-10-01 19:09:11 +0000 Commit: Michael Tuexen CommitDate: 2026-10-01 19:14:11 +0000 tcpdrop: improve handling of -C and -S Handle empty strings for -Cand -S correctly. Reported by: maxim Reviewed by: maxim MFC after: 1 week MFC to: stable/14 MFC to: stable/15 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D60210 --- usr.sbin/tcpdrop/tcpdrop.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/usr.sbin/tcpdrop/tcpdrop.c b/usr.sbin/tcpdrop/tcpdrop.c index 6f6b94789df1..00404cb98794 100644 --- a/usr.sbin/tcpdrop/tcpdrop.c +++ b/usr.sbin/tcpdrop/tcpdrop.c @@ -63,16 +63,16 @@ static void usage(void) __dead2; int main(int argc, char *argv[]) { - char stack[TCP_FUNCTION_NAME_LEN_MAX]; - char ca_name[TCP_CA_NAME_MAX]; - char *lport, *fport; + char stack_buf[TCP_FUNCTION_NAME_LEN_MAX]; + char ca_name_buf[TCP_CA_NAME_MAX]; + char *stack, *ca_name, *lport, *fport; bool dropall, dropspecific; int ch, state; dropall = false; dropspecific = false; - ca_name[0] = '\0'; - stack[0] = '\0'; + ca_name = NULL; + stack = NULL; state = -1; while ((ch = getopt(argc, argv, "aC:lS:s:")) != -1) { @@ -82,14 +82,16 @@ main(int argc, char *argv[]) break; case 'C': dropspecific = true; - strlcpy(ca_name, optarg, sizeof(ca_name)); + strlcpy(ca_name_buf, optarg, sizeof(ca_name_buf)); + ca_name = ca_name_buf; break; case 'l': tcpdrop_list_commands = true; break; case 'S': dropspecific = true; - strlcpy(stack, optarg, sizeof(stack)); + strlcpy(stack_buf, optarg, sizeof(stack_buf)); + stack = stack_buf; break; case 's': dropspecific = true; @@ -266,12 +268,12 @@ tcpdropall(const char *ca_name, const char *stack, int state) * If requested, skip sockets not having the requested * congestion control algorithm. */ - if (ca_name[0] != '\0' && + if (ca_name != NULL && strncmp(xtp->xt_cc, ca_name, TCP_CA_NAME_MAX)) continue; /* If requested, skip sockets not having the requested stack. */ - if (stack[0] != '\0' && + if (stack != NULL && strncmp(xtp->xt_stack, stack, TCP_FUNCTION_NAME_LEN_MAX)) continue;