From nobody Fri Oct 23 18:10:17 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 4jB9zY3S7wz6xPFC for ; Fri, 23 Oct 2026 18:10:17 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jB9zY2x6pz3Gxb for ; Fri, 23 Oct 2026 18:10:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792779017; 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=DQag6v162cAZhgmFhYMaUG7gU/33Cuvaa+iH+kcj/VY=; b=IfHEmq65S6dHcAm4d/wjpa1sNADJr/Hck2UQv/Bsjib2gRF3qJs1HjWa6PMkrthZT5qL6/ 4oq9SPV33MbjyeE4HxD7RTKA0QsaKIEAeK/HY5XC9x0Tt3SlKV2o9qqxFPuajL/n1Kmx9V EF2X3A1R81WpOwrTai3YSCbhJXOTortnjWDeUPN+0LaK9M1aaz1evYIjY7Zcv8dvaGFFeN sny3ZBlfF4TNnwzZBtbwWxVj2wKtRmhv+iBZ5tWm8w8cTuYxGW2x/0B3u3J0TDW6MpGuGH VaWWx26pnLXe3Bxh5LQ1FtKxpnsSbULm0IskH/hKKa+s0K2ptgoxGvv0uBvkTQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792779017; b=cuk4TYu83+UhI1eyEnqJWyzcusZjXCpb3piOMYFfi2zgsHcX0010GRU4Xz7UtBThgECSRz ws5X2CLJyWSzIVqweL2DorkC5eUtMO0yLiCb8+jc3577HeNs8j1aDe/Q10ABVtVJ0jSm5R MRkKtwhgXA9PMFoI5Lpqo1xNgos6iq3ojWlueTO0qAFeMJyrNIAzFI6QoSaCXhY4vhNWEw DPqNFx8MOKOLYuLi58gByTRdV2p+/MG1UFIudXvKvQ+H3EMAN5cdgHuE3/aYyL0Fe8w0hz borZ1dJZopxxNzdr79CvYqXV2bA3MlQ4m0JLGlQo4e0tTDXLKWH3dsxHbdc7gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792779017; 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=DQag6v162cAZhgmFhYMaUG7gU/33Cuvaa+iH+kcj/VY=; b=R7/i9bYmCBW23uivdMaml50HRySniGZckx24Qm2mMXbQUjUg1hRwFAgANPFI+2Uo/Veep3 Ag0fVDm7KbWWGAP05yYkRRKXi09frHVzm9gMrC9cRHtBzTljsyBv8pdIV3h6hhrZu+vxaf IJVxdcyGnJy6VqI129mlhssFo/Fy0lWeNBHEgc+3JxN/OGPIxXcBb7zTUkyhFJYS5G3wEn enmzAnkpaAW9dyU7AXxYmK6iORHcke0O+XDoWjpIp6YG94Hrh9FTrLKMUs5aHigOGHe9f8 SgGrzcZXH9cPKn0lumkyycmG71689PmzrRV3ZWRY1rGlnUtu9CGSUgj4T6KQcw== 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 4jB9zY2bCTzgyk for ; Fri, 23 Oct 2026 18:10:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d876 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Oct 2026 18:10:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: f9b8c1530cf6 - stable/15 - tcpdrop: improve handling of -C and -S List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository 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/stable/15 X-Git-Reftype: branch X-Git-Commit: f9b8c1530cf62f722d95bdaefaf59764d47303ae Auto-Submitted: auto-generated Date: Fri, 23 Oct 2026 18:10:17 +0000 Message-Id: <6adba309.1d876.ecc116b@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f9b8c1530cf62f722d95bdaefaf59764d47303ae commit f9b8c1530cf62f722d95bdaefaf59764d47303ae Author: Michael Tuexen AuthorDate: 2026-10-01 19:09:11 +0000 Commit: Michael Tuexen CommitDate: 2026-10-23 18:08:56 +0000 tcpdrop: improve handling of -C and -S Handle empty strings for -C and -S correctly. Reported by: maxim Reviewed by: maxim Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D60210 (cherry picked from commit e2279d5ba9a91407239cba4bed80abff73b15798) --- 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;