Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 5 Dec 2022 21:10:52 GMT
From:      Kristof Provost <kp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 577214cb0ac6 - stable/12 - pf: make pfsync_state_import appease an assert in pf_free_state
Message-ID:  <202212052110.2B5LAqog037309@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=577214cb0ac6c1433b39503af5b7b50e8f9985d5

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



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