Merge branch 'ip-Use-rb-trees-for-IP-frag-queue'
Peter Oskolkov says:
====================
ip: Use rb trees for IP frag queue.
This patchset
* changes IPv4 defrag behavior to match that of IPv6: overlapping
fragments now cause the whole IP datagram to be discarded (suggested
by David Miller): there are no legitimate use cases for overlapping
fragments;
* changes IPv4 defrag queue from a list to a rb tree (suggested
by Eric Dumazet): this change removes a potential attach vector.
Upcoming patches will contain similar changes for IPv6 frag queue,
as well as a comprehensive IP defrag self-test (temporarily delayed).
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
No related branches found
No related tags found
Showing
- include/linux/skbuff.h 7 additions, 4 deletionsinclude/linux/skbuff.h
- include/net/inet_frag.h 2 additions, 1 deletioninclude/net/inet_frag.h
- include/uapi/linux/snmp.h 1 addition, 0 deletionsinclude/uapi/linux/snmp.h
- net/core/skbuff.c 5 additions, 1 deletionnet/core/skbuff.c
- net/ipv4/inet_fragment.c 10 additions, 6 deletionsnet/ipv4/inet_fragment.c
- net/ipv4/ip_fragment.c 111 additions, 128 deletionsnet/ipv4/ip_fragment.c
- net/ipv4/proc.c 1 addition, 0 deletionsnet/ipv4/proc.c
- net/ipv6/netfilter/nf_conntrack_reasm.c 1 addition, 0 deletionsnet/ipv6/netfilter/nf_conntrack_reasm.c
- net/ipv6/reassembly.c 1 addition, 0 deletionsnet/ipv6/reassembly.c
Loading
Please register or sign in to comment