Differential D36903

pf: apply the network stack's ICMP rate limiting to ICMP errors sent by pf
ClosedPublic
Actions

Authored by kp on Oct 7 2022, 2:29 PM.

Details

Reviewers

None

Group Reviewers

network

Commits

rGa974702e274c: pf: apply the network stack's ICMP rate limiting to ICMP errors sent by pf

Summary

PR: 266477
Event: Aberdeen Hackathon 2022

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 47734
Build 44621: arc lint + arc unit

Event Timeline

kp created this revision.Oct 7 2022, 2:29 PM

Herald added subscribers: glebius, melifaro, farrokhi, imp. · View Herald TranscriptOct 7 2022, 2:29 PM

kp requested review of this revision.Oct 7 2022, 2:29 PM

Harbormaster completed remote builds in B47734: Diff 111552.Oct 7 2022, 2:29 PM

Is this for IPv4 ICMP only ?

In D36903#838094, @zlei.huang_gmail.com wrote:

Is this for IPv4 ICMP only ?

No. pf_send_icmp() is called for both IPv4 and IPv6. So we would indeed end up adding IPv6 ICMP errors to the IPv4 rate limits.
We should probably use the IPv6 rate limit for v6 errors. That function wants the destination IP address, but happily doesn't actually use it, so we can just pass NULL.

I'll see if I can update the patch.

Use the IPv6 rate limit check for IPv6 icmp errors

Herald added a subscriber: ae. · View Herald TranscriptOct 7 2022, 5:06 PM

Harbormaster completed remote builds in B47737: Diff 111561.Oct 7 2022, 5:06 PM

That looks simple and good.

Relatedly BANDLIM_ICMP6_UNREACH is defined (sys/netinet/icmp_var.h) but never used (along with the associated struct icmp_rate entry in sys/netinet/ip_icmp.c)

Looks good to me.

This revision was not accepted when it landed; it landed in state Needs Review.Oct 14 2022, 9:26 AM

Closed by commit rGa974702e274c: pf: apply the network stack's ICMP rate limiting to ICMP errors sent by pf (authored by kp). · Explain Why

This revision was automatically updated to reflect the committed changes.

kp added a commit: rGa974702e274c: pf: apply the network stack's ICMP rate limiting to ICMP errors sent by pf.