Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Sep 2022 15:02:40 GMT
From:      Mateusz Guzik <mjg@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 69ce6ae21acd - main - pf: make pfsync_state_import appease an assert in pf_free_state
Message-ID:  <202209061502.286F2ecH009685@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=69ce6ae21acd71b8e46d1f22176063e9d243511a

commit 69ce6ae21acd71b8e46d1f22176063e9d243511a
Author:     Mateusz Guzik <mjg@FreeBSD.org>
AuthorDate: 2022-09-06 14:56:29 +0000
Commit:     Mateusz Guzik <mjg@FreeBSD.org>
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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202209061502.286F2ecH009685>