From nobody Wed Sep 10 19:52:26 2025 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 4cMWYl1srsz66nRG; Wed, 10 Sep 2025 19:52:27 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cMWYl0VBfz3tsM; Wed, 10 Sep 2025 19:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757533947; 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=yEqsqLr4Tw1WrHNZ7RACbcjn1MowuMzlzhrbZrRuZ/Q=; b=DXQRmiMzp/fxvCK4g0cuDd4ufCbzR3EXsMrctoRVGN6nahmSGy8Ke9LBJSiEA4UfUTsdKR plNJgDujQuEqXUz6AgxuxcnpblkUYdGlc7p7SJbC7Jj5cPGj07Kye7CoF3rlUltOgkSyUm mucnuw5scMUfuS3uz0MIjcfEkV2Q0VsN20Yd89M5W/iMcb8rwF2AzcSW7bhifXY2XeiMXu SXKcuVzrJPDeewR3/SJqz7ewn2LTj+nSPfgW7Cog1Pbg1kalLXS0EBVnfStUMmd7Tg7JIa W3qXxNG4kWly0pPGNtr8UNcsjNE1lGIbt27/3EFVMBncmJtSbUHcwu5UehdttA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757533947; 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=yEqsqLr4Tw1WrHNZ7RACbcjn1MowuMzlzhrbZrRuZ/Q=; b=ymBdrzeUBmYKIjodVrKNv8/sH6E4/AivkNDfJJDo1pou+4nsfyfKB8Oxk4QbuksHNyRX36 J3wHtSG67kFm6B9Na08RcsxRy1cG/RGPPI7O/fpgzep6aUrqJutDja3oaOB+C5lquxRKTu 8r0IWts4KjZ139ya5XaBeh4jOCBH/xIrRquRDEsthV3dQQfLfxiBegWLXHmm7ashfW95mU rKIgbY5Xo5++MRu6a/D8X91vB/HN+D2PUiZDPiZO/G2I2Ny9eN9qSSBnGU5gzME0EkW5Cs ojFKgmEPtnTageX3ZepaT8TKoqp6DmzlInb3BhGIS49TVHI58q91bxjdr6WI/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757533947; a=rsa-sha256; cv=none; b=psZCzcC990onp8EAUApnLUuB7rEk3zL5/7MYFtj086545013Ps/MXX8HsYUFSnQxZw7i26 +VZYBs8jdQKa4e6koYrd+WlPQ1y3abAKuOp9XSNHycm4MIsn8cP+VC+fndqJVmao14Gi5f 2hNSoYgH36jU9jRgU+KcOQtrikDdT6C/4ayUU1E2/hKHz08j39rfGw7CKl0yC/nw2G+hGL fJNFJu1XAD32hnBsO4bF0OV+WLEaC1b40/KODfvnSl2aUlrqLcOVhcm1S4oW9GEbO+arBt xqX9yPo8oHjsPBm83zIxk+Ao/IF6YvQ0ck5BBumclo++qeKa5ok2peJO3ZzwWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cMWYk73yqzcN9; Wed, 10 Sep 2025 19:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58AJqQcl095369; Wed, 10 Sep 2025 19:52:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58AJqQxq095366; Wed, 10 Sep 2025 19:52:26 GMT (envelope-from git) Date: Wed, 10 Sep 2025 19:52:26 GMT Message-Id: <202509101952.58AJqQxq095366@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 4889545b8795 - main - pfctl: fix killing state by source and destination address 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4889545b8795b69bd9aca1c8320a8847f3cd6aeb Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4889545b8795b69bd9aca1c8320a8847f3cd6aeb commit 4889545b8795b69bd9aca1c8320a8847f3cd6aeb Author: Kristof Provost AuthorDate: 2025-08-20 14:16:03 +0000 Commit: Kristof Provost CommitDate: 2025-09-10 19:51:40 +0000 pfctl: fix killing state by source and destination address The fix to pfctl_kill_src_nodes() comes from Olivier Croquin. bluhm@ pointed out pfctl_net_kill_states() suffers from the same copy'n'paste typo. Commit combines both fixes. OK @bluhm, OK @kn Obtained from: OpenBSD, sashan , cde97ca321 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 10a833ea4850..2c12387ee388 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -701,7 +701,7 @@ pfctl_kill_src_nodes(int dev, int opts) dests++; - copy_satopfaddr(&psnk.psnk_src.addr.v.a.addr, + copy_satopfaddr(&psnk.psnk_dst.addr.v.a.addr, resp[1]->ai_addr); if (ioctl(dev, DIOCKILLSRCNODES, &psnk)) err(1, "DIOCKILLSRCNODES"); @@ -790,7 +790,7 @@ pfctl_net_kill_states(int dev, const char *iface, int opts) dests++; - copy_satopfaddr(&kill.src.addr.v.a.addr, + copy_satopfaddr(&kill.dst.addr.v.a.addr, resp[1]->ai_addr); if ((ret = pfctl_kill_states_h(pfh, &kill, &newkilled)) != 0)