Skip to content

net: ip6 defrag: backport fixes

Peter Oskolkov netdev stable 1 version Applied

Status from this message: I've queued it up for 4.19, thanks all!

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest3 patches 5 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/3net: IP defrag: encapsulate rbtree defrag code into callable functionsinclude/net/inet_frag.h net/ipv4/inet_fragment.c net/ipv4/ip_fragment.c+335 -2640 replies
2/3net: IP6 defrag: use rbtrees for IPv6 defraginclude/net/ipv6_frag.h net/ipv6/reassembly.c+71 -1730 replies
3/3net: IP6 defrag: use rbtrees in nf_conntrack_reasm.cnet/ipv6/netfilter/nf_conntrack_reasm.c+71 -1890 replies

Reviews trailers per patch

None of the 3 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchDavid S. Miller
SeriesA-b
1/3
2/3
3/3

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 4.19 stable 0/3] net: ip6 defrag: backport fixes

Currently, 4.19 and earlier stable kernels contain a security fix that is not fully IPv6 standard compliant.

This patchset backports IPv6 defrag fixes from 5.1rc that restore standard-compliance.

Original 5.1 patchet: https://patchwork.ozlabs.org/cover/1029418/

John Masinter (captwiggum), could you, please, confirm that this patchset fixes TAHI tests?

Peter Oskolkov (3):
net: IP defrag: encapsulate rbtree defrag code into callable functions
net: IP6 defrag: use rbtrees for IPv6 defrag
net: IP6 defrag: use rbtrees in nf_conntrack_reasm.c

 include/net/inet_frag.h                 |  16 +-
 include/net/ipv6_frag.h                 |  11 +-
 net/ipv4/inet_fragment.c                | 293 ++++++++++++++++++++++++
 net/ipv4/ip_fragment.c                  | 290 +++--------------------
 net/ipv6/netfilter/nf_conntrack_reasm.c | 260 ++++++---------------
 net/ipv6/reassembly.c                   | 233 +++++--------------
 6 files changed, 477 insertions(+), 626 deletions(-)
Signature · 1 line
2.21.0.392.gf8f6787159e-goog