[gentoo-commits] linux-patches r2462 - genpatches-2.6/trunk/3.0

[Mike Pagano (mpagano)]

Author: mpagano
Date: 2013-07-29 17:09:11 +0000 (Mon, 29 Jul 2013)
New Revision: 2462

Removed:
   genpatches-2.6/trunk/3.0/1510_af_key-fix-info-leaks-in-notify-messages.patch
   genpatches-2.6/trunk/3.0/1511_ipv6-ip6_sk_dst_check-must-not-assume-ipv6-dst.patch
Modified:
   genpatches-2.6/trunk/3.0/0000_README
Log:
Remove redundant patches

Modified: genpatches-2.6/trunk/3.0/0000_README
===================================================================
--- genpatches-2.6/trunk/3.0/0000_README	2013-07-29 14:49:28 UTC (rev 2461)
+++ genpatches-2.6/trunk/3.0/0000_README	2013-07-29 17:09:11 UTC (rev 2462)
@@ -391,14 +391,6 @@
 From:   https://bugs.gentoo.org/show_bug.cgi?id=470644
 Desc:   Support for namespace user.pax.* on tmpfs.
 
-Patch:  1510_af_key-fix-info-leaks-in-notify-messages.patch
-From:   http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=a5cc68f3d63306d0d288f31edfc2ae6ef8ecd887
-Desc:   af_key: fix info leaks in notify messages
-
-Patch:  1511_ipv6-ip6_sk_dst_check-must-not-assume-ipv6-dst.patch
-From:   http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=a963a37d384d71ad43b3e9e79d68d42fbe0901f3
-Desc:   ipv6: ip6_sk_dst_check() must not assume ipv6 dst
-
 Patch:  1512_af_key-initialize-satype-in-key_notify_policy_flush.patch
 From:   https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=85dfb745ee40232876663ae206cba35f24ab2a40
 Desc:   af_key: initialize satype in key_notify_policy_flush()

Deleted: genpatches-2.6/trunk/3.0/1510_af_key-fix-info-leaks-in-notify-messages.patch
===================================================================
--- genpatches-2.6/trunk/3.0/1510_af_key-fix-info-leaks-in-notify-messages.patch	2013-07-29 14:49:28 UTC (rev 2461)
+++ genpatches-2.6/trunk/3.0/1510_af_key-fix-info-leaks-in-notify-messages.patch	2013-07-29 17:09:11 UTC (rev 2462)
@@ -1,41 +0,0 @@
-From a5cc68f3d63306d0d288f31edfc2ae6ef8ecd887 Mon Sep 17 00:00:00 2001
-From: Mathias Krause <minipli@××××××××××.com>
-Date: Wed, 26 Jun 2013 23:52:30 +0200
-Subject: [PATCH] af_key: fix info leaks in notify messages
-
-key_notify_sa_flush() and key_notify_policy_flush() miss to initialize
-the sadb_msg_reserved member of the broadcasted message and thereby
-leak 2 bytes of heap memory to listeners. Fix that.
-
-Signed-off-by: Mathias Krause <minipli@××××××××××.com>
-Cc: Steffen Klassert <steffen.klassert@×××××××.com>
-Cc: "David S. Miller" <davem@×××××××××.net>
-Cc: Herbert Xu <herbert@××××××××××××××××.au>
-Signed-off-by: David S. Miller <davem@×××××××××.net>
----
- net/key/af_key.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/net/key/af_key.c b/net/key/af_key.c
-index c5fbd75..9da8620 100644
---- a/net/key/af_key.c
-+++ b/net/key/af_key.c
-@@ -1710,6 +1710,7 @@ static int key_notify_sa_flush(const struct km_event *c)
- 	hdr->sadb_msg_version = PF_KEY_V2;
- 	hdr->sadb_msg_errno = (uint8_t) 0;
- 	hdr->sadb_msg_len = (sizeof(struct sadb_msg) / sizeof(uint64_t));
-+	hdr->sadb_msg_reserved = 0;
- 
- 	pfkey_broadcast(skb, GFP_ATOMIC, BROADCAST_ALL, NULL, c->net);
- 
-@@ -2699,6 +2700,7 @@ static int key_notify_policy_flush(const struct km_event *c)
- 	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);
- 	return 0;
- 
--- 
-1.8.2.1
-

Deleted: genpatches-2.6/trunk/3.0/1511_ipv6-ip6_sk_dst_check-must-not-assume-ipv6-dst.patch
===================================================================
--- genpatches-2.6/trunk/3.0/1511_ipv6-ip6_sk_dst_check-must-not-assume-ipv6-dst.patch	2013-07-29 14:49:28 UTC (rev 2461)
+++ genpatches-2.6/trunk/3.0/1511_ipv6-ip6_sk_dst_check-must-not-assume-ipv6-dst.patch	2013-07-29 17:09:11 UTC (rev 2462)
@@ -1,52 +0,0 @@
-From a963a37d384d71ad43b3e9e79d68d42fbe0901f3 Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@××××××.com>
-Date: Wed, 26 Jun 2013 04:15:07 -0700
-Subject: [PATCH] ipv6: ip6_sk_dst_check() must not assume ipv6 dst
-
-It's possible to use AF_INET6 sockets and to connect to an IPv4
-destination. After this, socket dst cache is a pointer to a rtable,
-not rt6_info.
-
-ip6_sk_dst_check() should check the socket dst cache is IPv6, or else
-various corruptions/crashes can happen.
-
-Dave Jones can reproduce immediate crash with
-trinity -q -l off -n -c sendmsg -c connect
-
-With help from Hannes Frederic Sowa
-
-Reported-by: Dave Jones <davej@××××××.com>
-Reported-by: Hannes Frederic Sowa <hannes@×××××××××××××××.org>
-Signed-off-by: Eric Dumazet <edumazet@××××××.com>
-Acked-by: Hannes Frederic Sowa <hannes@×××××××××××××××.org>
-Signed-off-by: David S. Miller <davem@×××××××××.net>
----
- net/ipv6/ip6_output.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
-index 95703ba..d5d20cd 100644
---- a/net/ipv6/ip6_output.c
-+++ b/net/ipv6/ip6_output.c
-@@ -821,11 +821,17 @@ static struct dst_entry *ip6_sk_dst_check(struct sock *sk,
- 					  const struct flowi6 *fl6)
- {
- 	struct ipv6_pinfo *np = inet6_sk(sk);
--	struct rt6_info *rt = (struct rt6_info *)dst;
-+	struct rt6_info *rt;
- 
- 	if (!dst)
- 		goto out;
- 
-+	if (dst->ops->family != AF_INET6) {
-+		dst_release(dst);
-+		return NULL;
-+	}
-+
-+	rt = (struct rt6_info *)dst;
- 	/* Yes, checking route validity in not connected
- 	 * case is not very simple. Take into account,
- 	 * that we do not support routing by source, TOS,
--- 
-1.8.2.1
-