Differential D59015

pf: Fix fallout from the STATE_LOOKUP macro removal
ClosedPublic
Actions

Authored by markj on Wed, Aug 19, 10:00 PM.

Tags

None

Referenced Files

	F171176960: D59015.id.diff
	Wed, Sep 9, 6:46 AM

	Unknown Object (File)
	Tue, Sep 8, 5:25 PM

	Unknown Object (File)
	Tue, Sep 8, 7:56 AM

	Unknown Object (File)
	Sun, Sep 6, 4:53 PM

	Unknown Object (File)
	Sun, Sep 6, 1:01 AM

	Unknown Object (File)
	Sat, Sep 5, 12:12 PM

	Unknown Object (File)
	Sat, Sep 5, 12:05 PM

	Unknown Object (File)
	Sat, Sep 5, 11:15 AM

View All 58 Files

Subscribers

vegeta_tuxpowered.net

Details

Reviewers

Commits

rG00a793def743: pf: Fix fallout from the STATE_LOOKUP macro removal

Summary

Commit 8572367b6814 ("pf: remove STATE_LOOKUP") introduced two seemingly
unintentional changes with respect to divert(4)-injected packets (i.e.,
the PACKET_LOOPED case): we no longer return the matching state, and
direct callers of pf_find_state() now treat matches of diverted packets
the same as having no matching state at all.

This seems inadvertent, and breaks certain rulesets which use divert-to.
Fix them, and add a regression test case.

Fixes: 8572367b6814 ("pf: remove STATE_LOOKUP")

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

markj created this revision.Wed, Aug 19, 10:00 PM

Herald added subscribers: vegeta_tuxpowered.net, glebius, melifaro and 2 others. · View Herald TranscriptWed, Aug 19, 10:00 PM

markj requested review of this revision.Wed, Aug 19, 10:00 PM

Harbormaster completed remote builds in B75769: Diff 184408.Wed, Aug 19, 10:00 PM

Improve the test a bit: actually transmit some data, and verify that it was received.

Harbormaster completed remote builds in B75773: Diff 184412.Wed, Aug 19, 10:15 PM

kp accepted this revision.Mon, Aug 24, 3:19 PM

This revision is now accepted and ready to land.Mon, Aug 24, 3:19 PM

Closed by commit rG00a793def743: pf: Fix fallout from the STATE_LOOKUP macro removal (authored by markj). · Explain WhyThu, Aug 27, 1:33 PM

This revision was automatically updated to reflect the committed changes.

markj added a commit: rG00a793def743: pf: Fix fallout from the STATE_LOOKUP macro removal.

Revision Contents
Changeset List

Path

Size

sys/

netpfil/

pf/

17 lines

tests/

sys/

netpfil/

pf/

82 lines

Diff 185217

sys/netpfil/pf/pf.c

Loading...

tests/sys/netpfil/pf/route_to.sh

Loading...