From: Greg Kroah-Hartman Date: Thu, 12 Sep 2013 16:39:52 +0000 (-0700) Subject: remove af_key-initialize-satype-in-key_notify_policy_flush.patch from 3.0 and 3.4 X-Git-Tag: v3.0.96~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ae2f1ae0b1d74ab259aacdd406078171aa038c0;p=thirdparty%2Fkernel%2Fstable-queue.git remove af_key-initialize-satype-in-key_notify_policy_flush.patch from 3.0 and 3.4 --- diff --git a/queue-3.0/af_key-initialize-satype-in-key_notify_policy_flush.patch b/queue-3.0/af_key-initialize-satype-in-key_notify_policy_flush.patch deleted file mode 100644 index 328b545bb9a..00000000000 --- a/queue-3.0/af_key-initialize-satype-in-key_notify_policy_flush.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ca04998d1812ee7cdc7b30077df4c05dd835487c Mon Sep 17 00:00:00 2001 -From: Nicolas Dichtel -Date: Mon, 18 Feb 2013 16:24:20 +0100 -Subject: af_key: initialize satype in key_notify_policy_flush() - -From: Nicolas Dichtel - -[ Upstream commit 85dfb745ee40232876663ae206cba35f24ab2a40 ] - -This field was left uninitialized. Some user daemons perform check against this -field. - -Signed-off-by: Nicolas Dichtel -Signed-off-by: Steffen Klassert -Signed-off-by: Greg Kroah-Hartman ---- - net/key/af_key.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/net/key/af_key.c -+++ b/net/key/af_key.c -@@ -1704,6 +1704,7 @@ static int key_notify_sa_flush(const str - 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; - diff --git a/queue-3.0/series b/queue-3.0/series index f3922b68a9b..d1dea26d375 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -11,4 +11,3 @@ ipv6-don-t-depend-on-per-socket-memory-for-neighbour-discovery-messages.patch net-bridge-convert-mldv2-query-mrc-into-msecs_to_jiffies-for-max_delay.patch icmpv6-treat-dest-unreachable-codes-5-and-6-as-eacces-not-eproto.patch tipc-fix-lockdep-warning-during-bearer-initialization.patch -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 deleted file mode 100644 index 004bd147d41..00000000000 --- a/queue-3.4/af_key-initialize-satype-in-key_notify_policy_flush.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 930e232cc73bdf918a0896ffc458902ab8897a88 Mon Sep 17 00:00:00 2001 -From: Nicolas Dichtel -Date: Mon, 18 Feb 2013 16:24:20 +0100 -Subject: af_key: initialize satype in key_notify_policy_flush() - -From: Nicolas Dichtel - -[ Upstream commit 85dfb745ee40232876663ae206cba35f24ab2a40 ] - -This field was left uninitialized. Some user daemons perform check against this -field. - -Signed-off-by: Nicolas Dichtel -Signed-off-by: Steffen Klassert -Signed-off-by: Greg Kroah-Hartman ---- - net/key/af_key.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/net/key/af_key.c -+++ b/net/key/af_key.c -@@ -1704,6 +1704,7 @@ static int key_notify_sa_flush(const str - 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; - diff --git a/queue-3.4/series b/queue-3.4/series index 1251e643cec..b9e02d2e2fd 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -17,4 +17,3 @@ net-ipv6-tcp-fix-potential-use-after-free-in-tcp_v6_do_rcv.patch vhost-zerocopy-poll-vq-in-zerocopy-callback.patch macvtap-do-not-zerocopy-if-iov-needs-more-pages-than-max_skb_frags.patch tipc-fix-lockdep-warning-during-bearer-initialization.patch -af_key-initialize-satype-in-key_notify_policy_flush.patch