3.4-stable patches

added patches:
	af_key-initialize-satype-in-key_notify_policy_flush.patch

diff --git a/queue-3.4/af_key-initialize-satype-in-key_notify_policy_flush.patch b/queue-3.4/af_key-initialize-satype-in-key_notify_policy_flush.patch
new file mode 100644 (file)
index 0000000..31c0cc2
--- /dev/null
+++ b/queue-3.4/af_key-initialize-satype-in-key_notify_policy_flush.patch
@@ -0,0 +1,31 @@
+From 85dfb745ee40232876663ae206cba35f24ab2a40 Mon Sep 17 00:00:00 2001
+From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
+Date: Mon, 18 Feb 2013 16:24:20 +0100
+Subject: af_key: initialize satype in key_notify_policy_flush()
+
+From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
+
+commit 85dfb745ee40232876663ae206cba35f24ab2a40 upstream.
+
+This field was left uninitialized. Some user daemons perform check against this
+field.
+
+Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
+Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
+Cc: Luis Henriques <luis.henriques@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/key/af_key.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/net/key/af_key.c
++++ b/net/key/af_key.c
+@@ -2687,6 +2687,7 @@ static int key_notify_policy_flush(const
+       hdr->sadb_msg_pid = c->pid;
+       hdr->sadb_msg_version = PF_KEY_V2;
+       hdr->sadb_msg_errno = (uint8_t) 0;
++      hdr->sadb_msg_satype = SADB_SATYPE_UNSPEC;
+       hdr->sadb_msg_len = (sizeof(struct sadb_msg) / sizeof(uint64_t));
+       hdr->sadb_msg_reserved = 0;
+       pfkey_broadcast(skb_out, GFP_ATOMIC, BROADCAST_ALL, NULL, c->net);

diff --git a/queue-3.4/series b/queue-3.4/series
index c161451084fc6180f367c1166b02184ca4c9ae99..5436d62abfae23cc643725afc78c3dec861e3a66 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -19,3 +19,4 @@ md-raid1-raid10-use-freeze_array-in-place-of-raise_barrier.patch
 sparc32-add-ucmpdi2.patch
 sparc32-add-ucmpdi2.o-to-obj-y-instead-of-lib-y.patch
 mips-rewrite-pfn_valid-to-work-in-modules-too.patch
+af_key-initialize-satype-in-key_notify_policy_flush.patch