From nobody Mon Dec 5 21:10:52 2022 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 4NQx6N5VHMz4jYMq; Mon, 5 Dec 2022 21:10:52 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NQx6N542jz3p5m; Mon, 5 Dec 2022 21:10:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670274652; 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=EjN/qKaH3TR0njLwzcAte90nC6DbOBvzIt1SnBZNXhI=; b=UtsSLAp8QL3fjL0jHkCByTvNp4biQ/2mQr5Mlur3W3qUgVpuyoCjI//GE9EclHWTc4Y8ms HXVnGtaIK5iARey26v4M9TVeNxAOAy8H5SRaNczpZevOleyGiwVgm28flwIebn5fKk10b7 0uNlySCEB51e2PIXJ8kB6obW5QyikT87HZLaTmw8MY0tCzcar5FMhBlGug3aT3R4Ox9IhN OWyUEBHgl3KYMQZeO/4z5GC25lufHRUOD3hsnzSfo0rMhJHuVsNsRNJm/9dwrgdB/HA/c+ sgGwm6pwbxFZGWLxCPio5PcI3nvAkcRAAb6kCK+WhocCkgDiInA7PFAxri2DYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670274652; 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=EjN/qKaH3TR0njLwzcAte90nC6DbOBvzIt1SnBZNXhI=; b=AB/Gugl3lTcRrYFDmZyBQXWR5joaQolD1zqtIUe3+TTUTHdbmdWKTzeLiC66X+3CrSq9Ls fLsk1HeG8J/eiOCShSb1E0OnYkwazIdhJIu/FIb5jf5YDUzEueoBo4fQ1ZU+RyA+MVR3Ek 0oe/tgjZ+vvTbr0fKw0U4nF1e9FRfA4rDoZcZh6RARm/hNicfRtemi4Yz833gYuEdNc+nq 9JTKyqudynwQlSZsbly6Xl0KEurUUd9EvURVNztVtlLEi3EXgJoY2CL/sT+wBZnxPuBfP2 wP6NFducGNYOldMOii8IfhK+q48X+m0Ijxu+5mbPzNK7HD5gN0vfSLus9Mxv3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670274652; a=rsa-sha256; cv=none; b=F8Apo8Qek7D5VW+BiAWcT+SFWl6Ae8JsK/KtrrWzlXreL34pDHPk76pIFgkHnLbDtSuA/0 isCRd2OG8MumQJ6LROSBR4hL8uzhfe6drtisykJyk+aYlIAXF8vnmPt4zWIv5jSaXHM6of jhwfSh2C3gC4oI2QwCECKWE8Tb2khu5u4PWg1dpr7jhe07simKyEeqEImk08TlgyrtLDkd pZ4pn6v3IVDRheAnSvSey9yC1FEhbX2TxlDGxQRAZWW8aiCmqYovpfBUi98/jiuI6wBo5S n1c3tlUI/hjvIP/55t/VusQwMDcOx96koHpayBi6OVB4HtrZ/x4C9xbCA6PCYw== 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 4NQx6N48nMz1BYP; Mon, 5 Dec 2022 21:10:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B5LAqZH037310; Mon, 5 Dec 2022 21:10:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B5LAqog037309; Mon, 5 Dec 2022 21:10:52 GMT (envelope-from git) Date: Mon, 5 Dec 2022 21:10:52 GMT Message-Id: <202212052110.2B5LAqog037309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 577214cb0ac6 - stable/12 - pf: make pfsync_state_import appease an assert in pf_free_state 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/12 X-Git-Reftype: branch X-Git-Commit: 577214cb0ac6c1433b39503af5b7b50e8f9985d5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=577214cb0ac6c1433b39503af5b7b50e8f9985d5 commit 577214cb0ac6c1433b39503af5b7b50e8f9985d5 Author: Mateusz Guzik AuthorDate: 2022-09-06 14:56:29 +0000 Commit: Kristof Provost CommitDate: 2022-12-05 21:10:15 +0000 pf: make pfsync_state_import appease an assert in pf_free_state The newly created state failed to be inserted anywhere. This follows other places. Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 69ce6ae21acd71b8e46d1f22176063e9d243511a) --- sys/netpfil/pf/if_pfsync.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 88b85398db58..88e0831e82de 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -619,6 +619,7 @@ cleanup: cleanup_state: /* pf_state_insert() frees the state keys. */ if (st) { + st->timeout = PFTM_UNLINKED; /* appease an assert */ pf_free_state(st); } return (error);