Re: pfsync_bulk_update panic

[Alexandr Nedvedicky]

Hello Damjan,

> Are there plans for a syspatch to be released for this fix?

    the change uncovers two more issues I'd like get fixed before asking errata
    team to do the work. The diff against current is below if you want to give
    it a try too. 

    Hrvoje will test those changes in next few days.

thanks for understanding
regards
sashan

--------8<---------------8<---------------8<------------------8<--------
diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c
index 2bf93306da2..2ecf6d27304 100644
--- a/sys/net/if_pfsync.c
+++ b/sys/net/if_pfsync.c
@@ -1991,6 +1991,11 @@ pfsync_update_state(struct pf_state *st)
                st->sync_updates = 0;
                break;
 
+       case PFSYNC_S_DEL:
+       case PFSYNC_S_COUNT:
+       case PFSYNC_S_DEFER:
+               break;
+
        default:
                panic("pfsync_update_state: unexpected sync state %d",
                    st->sync_state);
diff --git a/sys/net/pf.c b/sys/net/pf.c
index 81939d45c31..51315207ba9 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1714,6 +1714,9 @@ pf_remove_state(struct pf_state *st)
 {
        PF_ASSERT_LOCKED();
 
+       if (st->timeout == PFTM_UNLINKED)
+               return;
+
        /* handle load balancing related tasks */
        pf_postprocess_addr(st);