netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Steffen Klassert <steffen.klassert@secunet.com>
To: David Miller <davem@davemloft.net>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
	Steffen Klassert <steffen.klassert@secunet.com>,
	<netdev@vger.kernel.org>
Subject: pull request (net): ipsec 2015-04-09
Date: Thu, 9 Apr 2015 12:32:09 +0200	[thread overview]
Message-ID: <1428575531-24870-1-git-send-email-steffen.klassert@secunet.com> (raw)

1) We dereferenced the xfrm outer_mode too early, larval
   SAs don't have it set. Move the dereference of the
   outer mode below the larval SA check to fix it.
   From Alexey Dobriyan.

2) Fix vti6 tunnel uninit on namespace crosssing.
   From Yao Xiwei.

Please pull or let me know if there are problems.

Thanks!

The following changes since commit f22e6e847115abc3a0e2ad7bb18d243d42275af1:

  Linux 4.0-rc7 (2015-04-06 15:39:45 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git master

for you to fetch changes up to 092a29a40bab8bb4530bb3e58a0597001cdecdef:

  vti6: fix uninit when using x-netns (2015-04-07 07:52:28 +0200)

----------------------------------------------------------------
Alexey Dobriyan (1):
      xfrm: fix xfrm_input/xfrm_tunnel_check oops

Yao Xiwei (1):
      vti6: fix uninit when using x-netns

 net/ipv6/ip6_vti.c    |  3 +--
 net/xfrm/xfrm_input.c | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

             reply	other threads:[~2015-04-09 10:32 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-09 10:32 Steffen Klassert [this message]
2015-04-09 10:32 ` [PATCH 1/2] xfrm: fix xfrm_input/xfrm_tunnel_check oops Steffen Klassert
2015-04-09 10:32 ` [PATCH 2/2] vti6: fix uninit when using x-netns Steffen Klassert
2015-04-09 18:39 ` pull request (net): ipsec 2015-04-09 David Miller

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=1428575531-24870-1-git-send-email-steffen.klassert@secunet.com \
    --to=steffen.klassert@secunet.com \
    --cc=davem@davemloft.net \
    --cc=herbert@gondor.apana.org.au \
    --cc=netdev@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).