From nobody Tue Sep 06 15:02:40 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 4MMTC509cnz4c0R9; Tue, 6 Sep 2022 15:02:41 +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 4MMTC46bbFz45VM; Tue, 6 Sep 2022 15:02:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662476560; 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=JmXGmOQtnr3AfabuNFh84KM1SVk0sX43Zdp0MvTL+bo=; b=ctcHa/F4X9BVNT8KEPFzLefK43Ms4sW7fBeE9EAVV+yTzAsdYjAcLRNMWO/tGDwZigCz8q auJgKBCr5WfdsZw/ZQViZ/SGIusNLnJ0YnAe3pJWuV0h9Tj6BjY3oW8BKdX4wxK18HQBWx Q5WmL/CmdmMnvl3g1dLxHQGz/jRbTtd7C82ZiYxZHo/L7uk4EFMJYxJ6HTxSiuTFopfc+Z YkcVEmAmh8VcvYnIr6ZKs/fgQZqw2GQriakxDxviJoLbR7Z/3u1c3oso8JdyrMsJKb65eS NZ1ardgrsLcoRCldcDtqXDnQGDesCVZSVtZ1z1q4awUjGL9XpB158L3exznYMA== 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 4MMTC45d1bz1Byf; Tue, 6 Sep 2022 15:02:40 +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 286F2eif009686; Tue, 6 Sep 2022 15:02:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 286F2ecH009685; Tue, 6 Sep 2022 15:02:40 GMT (envelope-from git) Date: Tue, 6 Sep 2022 15:02:40 GMT Message-Id: <202209061502.286F2ecH009685@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 69ce6ae21acd - main - 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69ce6ae21acd71b8e46d1f22176063e9d243511a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662476560; 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=JmXGmOQtnr3AfabuNFh84KM1SVk0sX43Zdp0MvTL+bo=; b=RkM64YWqy/rHFaoccs2WCxfFrbtmCSTo6/NfOX3NmftaKaEwdmG/4V23OrZsARNqqxqLr0 abUI80zRjJnHSsZDh54PsZUKrdRGG3R/YY0ADqsPlMv7dPre4s2+3DObVO1hHM6L6j3qRX GubD2EKmvdOjRdq+vp97yZUXegdhNNGVqXMA68FT2zQW7afVCkTRIZsnrget82G85Kbgc7 R4zyuT5w2tPfEEL1/5XFdOGnMxGlTGcjgQRyoCDtoV0X8CKfZAJXC0BOopTircEQOPVfXS k4b2gWAm89Q9XP1Uo5H81mk7MILnw2lDpKqDlOJKP5s8Sz5ON+ErN3ex3ZPsLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662476560; a=rsa-sha256; cv=none; b=TFxZxvul/8RDjWx21Vby0TY9mgglAcBUB9BkyGQ3RLNbCSUB8eIvZMirWE+NSQnxYyfSVQ Oh+9Nj2akSJsNID71JzvEi7c5U0LHdkeD/e4fBmSLfm3GLSI5v+5FegS2qq+Kt+v7Y3LKR PveGCKUslm89BdT03ZW7ux42tak/oIrzSi9MVS9HFHv561AgTDe7+Lmv+75RWQKMJw07yZ boJsQjIlQNyqyy+d9xgJjJHFDYXbtsMxR73SGV9EvnuqLBAIABAnF45y/kTDaBYksOL+66 LdXJngwK/DsvqbSACPb0vlCm0IDRCxFs3HuRyF5pBM/k3ey9urObwbHewiZBKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=69ce6ae21acd71b8e46d1f22176063e9d243511a commit 69ce6ae21acd71b8e46d1f22176063e9d243511a Author: Mateusz Guzik AuthorDate: 2022-09-06 14:56:29 +0000 Commit: Mateusz Guzik CommitDate: 2022-09-06 15:00:46 +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") --- 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 bf4b9322df56..9cc25c83bd06 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -611,6 +611,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);