Skip to content

netfilter: conntrack: switch to siphash

Florian Westphal netfilter-devel 1 version Applied

Status from this message: Applied, thanks.

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest3 patches 1 replyApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/3netfilter: conntrack: sanitize table size default settingsDocumentation/networking/nf_conntrack-sysctl.rst net/netfilter/nf_conntrack_core.c+22 -210 replies
2/3netfilter: conntrack: switch to siphashnet/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_expect.c net/netfilter/nf_nat_core.c+50 -240 replies
3/3netfilter: conntrack: refuse insertion if chain has grown too largeinclude/linux/netfilter/nf_conntrack_common.h include/uapi/linux/netfilter/nfnetlink_conntrack.h net/netfilter/nf_conntrack_core.c +2 more+42 -100 replies
3/3netfilter: refuse insertion if chain has grown too largeinclude/linux/netfilter/nf_conntrack_common.h include/uapi/linux/netfilter/nfnetlink_conntrack.h net/netfilter/nf_conntrack_core.c +2 more+42 -100 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH nf 0/3] netfilter: conntrack: switch to siphash

Two recent commits switched inet rt and nexthop exception hashes from jhash to siphash.

If those two spots are problematic then conntrack is affected as well, so switch voer to siphash too.

While at it, add a hard upper limit on chain lengths and reject insertion if this is hit.

Florian Westphal (3):
netfilter: conntrack: sanitize table size default settings
netfilter: conntrack: switch to siphash
netfilter: conntrack: refuse insertion if chain has grown too large

 .../networking/nf_conntrack-sysctl.rst        |  13 ++-
 include/linux/netfilter/nf_conntrack_common.h |   1 +
 .../linux/netfilter/nfnetlink_conntrack.h     |   1 +
 net/netfilter/nf_conntrack_core.c             | 103 ++++++++++++------
 net/netfilter/nf_conntrack_expect.c           |  25 +++--
 net/netfilter/nf_conntrack_netlink.c          |   4 +-
 net/netfilter/nf_conntrack_standalone.c       |   4 +-
 net/netfilter/nf_nat_core.c                   |  18 ++-
 8 files changed, 114 insertions(+), 55 deletions(-)
Signature · 1 line
2.31.1