backport of IP fragmentation fixes
Get series with b4
b4 am [email protected]Versions newest first
- v3 Latest30 patches 14 repliesIn review
Patches in v3 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/30 | inet: frags: change inet_frags_init_net() return valueinclude/ net/ net/ +2 more | +37 | 0 replies | |
| 2/30 | inet: frags: add a pointer to struct netns_fragsinclude/ include/ net/ +4 more | +48 | 0 replies | |
| 3/30 | inet: frags: refactor ipfrag_init()net/ | +2 | 0 replies | |
| 4/30 | inet: frags: Convert timers to use timer_setup()include/ net/ net/ +3 more | +15 | 0 replies | |
| 5/30 | inet: frags: refactor ipv6_frag_init()net/ | +14 | 0 replies | |
| 6/30 | inet: frags: refactor lowpan_net_frag_init()net/ | +11 | 0 replies | |
| 7/30 | ipv6: export ip6 fragments sysctl to unprivileged usersnet/ | +0 | 0 replies | |
| 8/30 | rhashtable: add schedule pointslib/ | +2 | 0 replies | |
| 9/30 | inet: frags: use rhashtables for reassembly unitsDocumentation/ include/ include/ +6 more | +266 | 0 replies | |
| 10/30 | inet: frags: remove some helpersinclude/ include/ include/ +3 more | +6 | 0 replies | |
| 11/30 | inet: frags: get rif of inet_frag_evicting()include/ net/ net/ | +32 | 0 replies | |
| 12/30 | inet: frags: remove inet_frag_maybe_warn_overflow()include/ net/ net/ +3 more | +8 | 0 replies | |
| 13/30 | inet: frags: break the 2GB limit for frags storageDocumentation/ include/ net/ +5 more | +32 | 0 replies | |
| 14/30 | inet: frags: do not clone skb in ip_expire()net/ | +6 | 0 replies | |
| 15/30 | ipv6: frags: rewrite ip6_expire_frag_queue()net/ | +16 | 0 replies | |
| 16/30 | rhashtable: reorganize struct rhashtable layoutinclude/ | +4 | 0 replies | |
| 17/30 | inet: frags: reorganize struct netns_fragsinclude/ | +5 | 0 replies | |
| 18/30 | inet: frags: get rid of ipfrag_skb_cb/FRAG_CBinclude/ net/ | +15 | 0 replies | |
| 19/30 | inet: frags: fix ip6frag_low_thresh boundarynet/ net/ net/ +1 more | +3 | 0 replies | |
| 20/30 | ip: discard IPv4 datagrams with overlapping segments.include/ net/ net/ | +21 | 0 replies | |
| 21/30 | net: speed up skb_rbtree_purge()net/ | +7 | 0 replies | |
| 22/30 | net: modify skb_rbtree_purge to return the truesize of all purged skbs.include/ net/ | +6 | 0 replies | |
| 23/30 | ipv6: defrag: drop non-last frags smaller than min mtunet/ net/ | +8 | 12 replies | |
| 24/30 | net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friendsinclude/ net/ | +16 | 0 replies | |
| 25/30 | net: add rb_to_skb() and other rb tree helpersinclude/ net/ net/ +1 more | +37 | 0 replies | |
| 26/30 | net: sk_buff rbnode reorginclude/ include/ net/ +3 more | +129 | 1 reply | |
| 27/30 | ipv4: frags: precedence bug in ip_expire()net/ | +1 | 0 replies | |
| 28/30 | ip: add helpers to process in-order fragments faster.include/ net/ | +79 | 0 replies | |
| 29/30 | ip: process in-order fragments efficientlynet/ net/ | +70 | 0 replies | |
| 30/30 | ip: frags: fix crash in ip_do_fragment()net/ net/ | +2 | 0 replies |
Reviews trailers per patch
5 of 30 patches have a Reviewed-by or Acked-by.
| Patch | Stefan Schmidt | Herbert Xu | Stephen Hemminger | Soheil Hassas Yeganeh | Eric Dumazet |
|---|---|---|---|---|---|
| 1/30 | |||||
| 2/30 | |||||
| 3/30 | |||||
| 4/30 | A-b | ||||
| 5/30 | |||||
| 6/30 | |||||
| 7/30 | |||||
| 8/30 | A-b | ||||
| 9/30 | |||||
| 10/30 | |||||
| 11/30 | |||||
| 12/30 | |||||
| 13/30 | |||||
| 14/30 | |||||
| 15/30 | |||||
| 16/30 | |||||
| 17/30 | |||||
| 18/30 | |||||
| 19/30 | |||||
| 20/30 | A-b | ||||
| 21/30 | |||||
| 22/30 | |||||
| 23/30 | |||||
| 24/30 | |||||
| 25/30 | |||||
| 26/30 | A-b | ||||
| 27/30 | |||||
| 28/30 | |||||
| 29/30 | |||||
| 30/30 | R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 5 reviewers.
Cover letter [PATCH v3 00/30] backport of IP fragmentation fixes
Took the set of patches from 4.19 to handle IP fragmentation DoS and applied them against 4.14.69. Most of these are from Eric. In a couple case, it required some manual merge conflict resolution.
Tested normal IP fragmentation with iperf3 and malicious IP fragments with fragmentsmack. Under fragmentation attack (700Kpps) the original 4.14.69 consumes 97% CPU; with this patch it drops to 5%.
v3 - send to wider audience
v2 - added patch from 4.19 linux-next to fix ip fragmentation crash
Dan Carpenter (1):
ipv4: frags: precedence bug in ip_expire()
Eric Dumazet (22):
inet: frags: change inet_frags_init_net() return value
inet: frags: add a pointer to struct netns_frags
inet: frags: refactor ipfrag_init()
inet: frags: refactor ipv6_frag_init()
inet: frags: refactor lowpan_net_frag_init()
ipv6: export ip6 fragments sysctl to unprivileged users
rhashtable: add schedule points
inet: frags: use rhashtables for reassembly units
inet: frags: remove some helpers
inet: frags: get rif of inet_frag_evicting()
inet: frags: remove inet_frag_maybe_warn_overflow()
inet: frags: break the 2GB limit for frags storage
inet: frags: do not clone skb in ip_expire()
ipv6: frags: rewrite ip6_expire_frag_queue()
rhashtable: reorganize struct rhashtable layout
inet: frags: reorganize struct netns_frags
inet: frags: get rid of ipfrag_skb_cb/FRAG_CB
inet: frags: fix ip6frag_low_thresh boundary
net: speed up skb_rbtree_purge()
net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends
net: add rb_to_skb() and other rb tree helpers
net: sk_buff rbnode reorg
Florian Westphal (1):
ipv6: defrag: drop non-last frags smaller than min mtu
Kees Cook (1):
inet: frags: Convert timers to use timer_setup()
Peter Oskolkov (4):
ip: discard IPv4 datagrams with overlapping segments.
net: modify skb_rbtree_purge to return the truesize of all purged
skbs.
ip: add helpers to process in-order fragments faster.
ip: process in-order fragments efficiently
Taehee Yoo (1):
ip: frags: fix crash in ip_do_fragment()
Documentation/networking/ip-sysctl.txt | 13 +- include/linux/rhashtable.h | 8 +- include/linux/skbuff.h | 50 +- include/net/inet_frag.h | 135 +++--- include/net/ip.h | 1 - include/net/ipv6.h | 26 +- include/uapi/linux/snmp.h | 1 + lib/rhashtable.c | 2 + net/core/skbuff.c | 31 +- net/ieee802154/6lowpan/6lowpan_i.h | 26 +- net/ieee802154/6lowpan/reassembly.c | 153 ++++--- net/ipv4/inet_fragment.c | 378 ++++------------ net/ipv4/ip_fragment.c | 578 +++++++++++++----------- net/ipv4/proc.c | 7 +- net/ipv4/tcp_fastopen.c | 8 +- net/ipv4/tcp_input.c | 33 +- net/ipv6/netfilter/nf_conntrack_reasm.c | 105 ++--- net/ipv6/proc.c | 5 +- net/ipv6/reassembly.c | 217 ++++----- net/sched/sch_netem.c | 14 +- 20 files changed, 802 insertions(+), 989 deletions(-)
Signature · 1 line
2.18.0