netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peter Oskolkov <posk@google.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, netdev@vger.kernel.org
Cc: Peter Oskolkov <posk@posk.io>, David Miller <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Sasha Levin <sashal@kernel.org>,
	Captain Wiggum <captwiggum@gmail.com>,
	Lars Persson <lists@bofh.nu>, Peter Oskolkov <posk@google.com>
Subject: [PATCH 4.19 stable v2 0/3] net: ip6 defrag: backport fixes
Date: Tue, 23 Apr 2019 10:25:30 -0700	[thread overview]
Message-ID: <20190423172533.245939-1-posk@google.com> (raw)

Lars Persson <lists@bofh.nu> reported that a label was unused in
the 4.14 version of this patchset, and the issue was present in
the 4.19 patchset as well, so I'm sending a v2 that fixes it.

The original 4.19 patchset queued for stable is OK, and
can be used as is, but this v2 is a bit better: it fixes the
unused label issue and handles overlapping fragments better.

Sorry for the mess/v2.

=======================

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/

v2 changes: handle overlapping fragments the way it is done upstream


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                  | 302 +++---------------------
 net/ipv6/netfilter/nf_conntrack_reasm.c | 260 ++++++--------------
 net/ipv6/reassembly.c                   | 240 ++++++-------------
 6 files changed, 488 insertions(+), 634 deletions(-)

-- 
2.21.0.593.g511ec345e18-goog


             reply	other threads:[~2019-04-23 17:25 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-23 17:25 Peter Oskolkov [this message]
2019-04-23 17:25 ` [PATCH 4.19 stable v2 1/3] net: IP defrag: encapsulate rbtree defrag code into callable functions Peter Oskolkov
2019-04-23 17:25 ` [PATCH 4.19 stable v2 2/3] net: IP6 defrag: use rbtrees for IPv6 defrag Peter Oskolkov
2019-04-23 17:25 ` [PATCH 4.19 stable v2 3/3] net: IP6 defrag: use rbtrees in nf_conntrack_reasm.c Peter Oskolkov
2019-04-23 23:47 ` [PATCH 4.19 stable v2 0/3] net: ip6 defrag: backport fixes Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190423172533.245939-1-posk@google.com \
    --to=posk@google.com \
    --cc=captwiggum@gmail.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=lists@bofh.nu \
    --cc=netdev@vger.kernel.org \
    --cc=posk@posk.io \
    --cc=sashal@kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).