Page MenuHomeFreeBSD
Differential D56501

pf: Use MTX_DUPOK to initialize hash chain mutexes
ClosedPublic
Actions

Authored by markj on Apr 18 2026, 12:12 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Jun 15, 1:16 AM
Unknown Object (File)
Thu, Jun 4, 5:00 PM
Unknown Object (File)
Thu, Jun 4, 4:32 PM
Unknown Object (File)
Wed, Jun 3, 10:23 PM
Unknown Object (File)
Thu, May 21, 11:23 AM
Unknown Object (File)
May 18 2026, 6:12 PM
Unknown Object (File)
May 18 2026, 11:32 AM
Unknown Object (File)
May 18 2026, 11:25 AM
View All 47 Files
Subscribers
farrokhi
imp
melifaro
vegeta_tuxpowered.net

Details

Reviewers
kp
glebius
Commits
rGffad36e1d700: pf: Use MTX_DUPOK to initialize hash chain mutexes
Summary

pf_udp_mapping_insert() may lock more than one row at a time.

Fixes: cd5ff4e841fb ("pf: use hashalloc(9) for key, id, src-node and udp-endpoint hashes")

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

markj created this revision.Apr 18 2026, 12:12 PM
Herald added subscribers: vegeta_tuxpowered.net, melifaro, farrokhi, imp. · View Herald TranscriptApr 18 2026, 12:12 PM
markj requested review of this revision.Apr 18 2026, 12:12 PM
Harbormaster completed remote builds in B72322: Diff 175832.Apr 18 2026, 12:13 PM
glebius requested changes to this revision.Apr 18 2026, 6:58 PM

I screwed up, but not on this hash. Looking at cd5ff4e841fb I see that I lost MTX_DUPOK on UDP endpoint hash.

This revision now requires changes to proceed.Apr 18 2026, 6:58 PM
glebius added inline comments.Apr 18 2026, 6:58 PM
sys/netpfil/pf/pf.c
1499–1500

Should be here!

kp added a comment.Apr 19 2026, 9:37 AM

I did see a warning about that recently but didn't investigate too much. This (with Gleb's remark) makes sense.

markj updated this revision to Diff 175904.Apr 20 2026, 3:10 PM

Update the right hash.

Harbormaster completed remote builds in B72369: Diff 175904.Apr 20 2026, 3:10 PM
kp added inline comments.Apr 20 2026, 3:24 PM
sys/netpfil/pf/pf.c
1500

That wants to be 'lopts', not 'lops'.

markj updated this revision to Diff 175906.Apr 20 2026, 3:25 PM
markj marked an inline comment as done.

Typo

Harbormaster completed remote builds in B72371: Diff 175906.Apr 20 2026, 3:25 PM
kp accepted this revision.Apr 20 2026, 4:12 PM
This revision was not accepted when it landed; it landed in state Needs Review.Apr 20 2026, 4:50 PM
Closed by commit rGffad36e1d700: pf: Use MTX_DUPOK to initialize hash chain mutexes (authored by markj). · Explain Why
This revision was automatically updated to reflect the committed changes.
markj added a commit: rGffad36e1d700: pf: Use MTX_DUPOK to initialize hash chain mutexes.

Revision Contents
Changeset List

PathSize
sys/
netpfil/
pf/
1 line

Diff 175916

View Options

sys/netpfil/pf/pf.c

Loading...