Page MenuHomeFreeBSD

pf: Initialize pf_kpool mutexes earlier
ClosedPublic

Authored by markj on Jan 31 2022, 5:40 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Aug 13, 7:59 PM
Unknown Object (File)
Thu, Aug 13, 7:55 PM
Unknown Object (File)
Thu, Aug 13, 6:49 AM
Unknown Object (File)
Wed, Aug 12, 8:25 AM
Unknown Object (File)
Mon, Aug 10, 9:15 PM
Unknown Object (File)
Mon, Aug 10, 10:43 AM
Unknown Object (File)
Mon, Aug 10, 10:24 AM
Unknown Object (File)
Sat, Aug 8, 9:47 PM

Details

Summary

There are some error paths in ioctl handlers that will call
pf_krule_free() before the rule's rpool.mtx field is initialized,
causing a panic with INVARIANTS enabled.

Fix the problem by introducing pf_krule_alloc() and initializing the
mutex there. This does mean that the rule->krule and pool->kpool
conversion functions need to stop zeroing the input structure, but I
don't see a nicer way to handle this except perhaps by guarding the
mtx_destroy() with a mtx_initialized() check.

Constify some related functions while here and add a regression test
based on a syzkaller reproducer.

Reported by: syzbot+77cd12872691d219c158@syzkaller.appspotmail.com

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 44196
Build 41084: arc lint + arc unit