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 2014-02-27
Date: Thu, 27 Feb 2014 07:16:34 +0100 [thread overview]
Message-ID: <1393481799-20492-1-git-send-email-steffen.klassert@secunet.com> (raw)
1) Build fix for ip_vti when NET_IP_TUNNEL is not set.
We need this set to have ip_tunnel_get_stats64()
available.
2) Fix a NULL pointer dereference on sub policy usage.
We try to access a xfrm_state from the wrong array.
3) Take xfrm_state_lock in xfrm_migrate_state_find(),
we need it to traverse through the state lists.
4) Clone states properly on migration, otherwise we crash
when we migrate a state with aead algorithm attached.
5) Fix unlink race when between thread context and timer
when policies are deleted.
Please pull or let me know if there are problems.
Thanks!
The following changes since commit 960dfc4eb23a28495276b02604d7458e0e1a1ed8:
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (2014-02-18 16:36:07 -0800)
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 3a9016f97fdc8bfbb26ff36ba8f3dc9162eb691b:
xfrm: Fix unlink race when policies are deleted. (2014-02-26 09:52:02 +0100)
----------------------------------------------------------------
Steffen Klassert (5):
ip6_vti: Fix build when NET_IP_TUNNEL is not set.
xfrm: Fix NULL pointer dereference on sub policy usage
xfrm: Take xfrm_state_lock in xfrm_migrate_state_find
xfrm: Clone states properly on migration
xfrm: Fix unlink race when policies are deleted.
include/net/xfrm.h | 11 +++++++++++
net/ipv6/Kconfig | 1 +
net/xfrm/xfrm_policy.c | 2 +-
net/xfrm/xfrm_state.c | 23 +++++++++++++++++------
net/xfrm/xfrm_user.c | 5 -----
5 files changed, 30 insertions(+), 12 deletions(-)
next reply other threads:[~2014-02-27 6:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-27 6:16 Steffen Klassert [this message]
2014-02-27 6:16 ` [PATCH 1/5] ip6_vti: Fix build when NET_IP_TUNNEL is not set Steffen Klassert
2014-02-27 6:16 ` [PATCH 2/5] xfrm: Fix NULL pointer dereference on sub policy usage Steffen Klassert
2014-02-27 6:16 ` [PATCH 3/5] xfrm: Take xfrm_state_lock in xfrm_migrate_state_find Steffen Klassert
2014-02-27 6:16 ` [PATCH 4/5] xfrm: Clone states properly on migration Steffen Klassert
2014-02-27 6:16 ` [PATCH 5/5] xfrm: Fix unlink race when policies are deleted Steffen Klassert
2014-02-27 6:27 ` Herbert Xu
2014-02-27 6:30 ` Herbert Xu
2014-02-27 6:53 ` Steffen Klassert
2014-02-27 7:01 ` Herbert Xu
2014-02-27 21:20 ` pull request (net): ipsec 2014-02-27 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=1393481799-20492-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).