From nobody Mon Dec 05 21:11:01 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 4NQx6Y5FGpz4jYHG; Mon, 5 Dec 2022 21:11:01 +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 4NQx6Y4mvZz3pjm; Mon, 5 Dec 2022 21:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670274661; 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=DQI9OQzbngkRuliw+X2v4rh+6XnA9Rdu1YjEkem3J78=; b=Bl0WerqQRO6Ld+GT2keTkxeoWGc4qbHppAGp8NHUuKV+zcYbvxGK4q619BDwf1Ieoi1MFL NDTBl7wkUsdnPn5yBBalNL+bgyXfTVqcrCr7BDXeV1ovGR5uykLMJqq+tvq06LmdsZsbyJ sEqQ9ZmeUErCBa0fo9Vcmg9A6DTG1WRpn9trvAn2yvjbhgBwA8C9bzc7SBf2xmJn86OKe4 IIejdXOiRRkg+6QSxiVx5Q46D8YnqN8lLqi8v71ycGPM1SpA+ZPLu7SykPVn97Tv5QsBMI q69tpzVxmPEW/Y9Kncqhscvr0UKl8hBUPj/GqcvafHmYD0k8uWT889rO15qv7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670274661; 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=DQI9OQzbngkRuliw+X2v4rh+6XnA9Rdu1YjEkem3J78=; b=gbYOV46M/Iw0W2ZK6vSHgi/sPwg6rxzzEqLWvaUQid18kAN1h49+fvUyHPWtiJP/WMHcHi VLtjhMcAh3eUtvEsTNIkbKtaF08Ogb0LP/MRYFR5KwPhRa6s97G521Eue1lJgDR7sx4Dpx QsHUDbLOrw8s4DctkmJG5G2D5vL2AJyfJK6f/WUUIzDL8rDBuvk0Q6ZKbTqFr2s4S/Orbs MtD+L2B2stSGVik/CypS3xrS7mzhTB8EVMd64IBtkDvngcF6ElkJgTgkn5+QL1MoXeJcex o+ISfClec/Wo3/2gHC1ahAFp8KPLOGOfht+T2Npg8awTbQLDXPfjszRwlcaO3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670274661; a=rsa-sha256; cv=none; b=B1yGU7N7LH+oAdRPhxbZEffx+czPf48DiHshEG7PK6k8ZuPLx11TvBnkB6OB7LU6QQbmWp B9EUaQaifsPTG69Yn929jdQ1h2jrlaF4xC9L7pkY0Qj7+8bvL15x7o7hGzDp7qJNukeChC gtEpz+7p+UoVd7yvSHB0GSQnmjQJM0DqmYdYGRg2Ju+68MvjwRqUvWwZ5iJhRTvgNSzOvE EzAfz/jCbU+TXJhCmuhUEPA+X2IKX+sD9nbekF27TvYX7iIF5/7gF98WTf+JV0njgn4AJr PlEDl4fOjt+FTfchD5DVEmy6o7xwFgC+qvdPwhopXFSvqvb9NegoPSSsIRrPBQ== 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 4NQx6Y3qVSz1Bc8; Mon, 5 Dec 2022 21:11:01 +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 2B5LB1aQ037461; Mon, 5 Dec 2022 21:11:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B5LB10s037460; Mon, 5 Dec 2022 21:11:01 GMT (envelope-from git) Date: Mon, 5 Dec 2022 21:11:01 GMT Message-Id: <202212052111.2B5LB10s037460@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: 7efa85c12303 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 7efa85c12303c532b3c87d08dc6e6020fb2c18cc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=7efa85c12303c532b3c87d08dc6e6020fb2c18cc commit 7efa85c12303c532b3c87d08dc6e6020fb2c18cc Author: Mateusz Guzik AuthorDate: 2022-09-06 14:56:29 +0000 Commit: Kristof Provost CommitDate: 2022-12-05 19:27:01 +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 e22e0d35f182..33e06eb4c79f 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -618,6 +618,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);