[gentoo-commits] linux-patches r2458 - genpatches-2.6/trunk/3.10

[Mike Pagano (mpagano)]

Author: mpagano
Date: 2013-07-29 00:59:57 +0000 (Mon, 29 Jul 2013)
New Revision: 2458

Removed:
   genpatches-2.6/trunk/3.10/1600_CVE-2013-4125-ipv6-fix-fib6_add_rt2node-BUG.patch
   genpatches-2.6/trunk/3.10/1600_CVE-2013-4127-fix-use-after-free-in-vhost_net_flush.patch
Modified:
   genpatches-2.6/trunk/3.10/0000_README
Log:
Removal of redundant patches

Modified: genpatches-2.6/trunk/3.10/0000_README
===================================================================
--- genpatches-2.6/trunk/3.10/0000_README	2013-07-29 00:45:13 UTC (rev 2457)
+++ genpatches-2.6/trunk/3.10/0000_README	2013-07-29 00:59:57 UTC (rev 2458)
@@ -59,14 +59,6 @@
 From:   https://bugs.gentoo.org/show_bug.cgi?id=470644
 Desc:   Support for namespace user.pax.* on tmpfs.
 
-Patch:  1600_CVE-2013-4125-ipv6-fix-fib6_add_rt2node-BUG.patch
-From:   http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=307f2fb95e9b96b3577916e73d92e104f8f26494
-Desc:   ipv6: only static routes qualify for equal cost multipathing
-
-Patch:  1600_CVE-2013-4127-fix-use-after-free-in-vhost_net_flush.patch
-From:   http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=dd7633ecd553a5e304d349aa6f8eb8a0417098c5
-Desc:   vhost-net: fix use-after-free in vhost_net_flush
-
 Patch:  1700_enable-thinkpad-micled.patch
 From:   https://bugs.gentoo.org/show_bug.cgi?id=449248
 Desc:   Enable mic mute led in thinkpads

Deleted: genpatches-2.6/trunk/3.10/1600_CVE-2013-4125-ipv6-fix-fib6_add_rt2node-BUG.patch
===================================================================
--- genpatches-2.6/trunk/3.10/1600_CVE-2013-4125-ipv6-fix-fib6_add_rt2node-BUG.patch	2013-07-29 00:45:13 UTC (rev 2457)
+++ genpatches-2.6/trunk/3.10/1600_CVE-2013-4125-ipv6-fix-fib6_add_rt2node-BUG.patch	2013-07-29 00:59:57 UTC (rev 2458)
@@ -1,79 +0,0 @@
-From 307f2fb95e9b96b3577916e73d92e104f8f26494 Mon Sep 17 00:00:00 2001
-From: Hannes Frederic Sowa <hannes@×××××××××××××××.org>
-Date: Fri, 12 Jul 2013 21:46:33 +0000
-Subject: ipv6: only static routes qualify for equal cost multipathing
-
-Static routes in this case are non-expiring routes which did not get
-configured by autoconf or by icmpv6 redirects.
-
-To make sure we actually get an ecmp route while searching for the first
-one in this fib6_node's leafs, also make sure it matches the ecmp route
-assumptions.
-
-v2:
-a) Removed RTF_EXPIRE check in dst.from chain. The check of RTF_ADDRCONF
-   already ensures that this route, even if added again without
-   RTF_EXPIRES (in case of a RA announcement with infinite timeout),
-   does not cause the rt6i_nsiblings logic to go wrong if a later RA
-   updates the expiration time later.
-
-v3:
-a) Allow RTF_EXPIRES routes to enter the ecmp route set. We have to do so,
-   because an pmtu event could update the RTF_EXPIRES flag and we would
-   not count this route, if another route joins this set. We now filter
-   only for RTF_GATEWAY|RTF_ADDRCONF|RTF_DYNAMIC, which are flags that
-   don't get changed after rt6_info construction.
-
-Cc: Nicolas Dichtel <nicolas.dichtel@×××××.com>
-Signed-off-by: Hannes Frederic Sowa <hannes@×××××××××××××××.org>
-Signed-off-by: David S. Miller <davem@×××××××××.net>
----
-diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
-index 192dd1a..5fc9c7a 100644
---- a/net/ipv6/ip6_fib.c
-+++ b/net/ipv6/ip6_fib.c
-@@ -632,6 +632,12 @@ insert_above:
- 	return ln;
- }
- 
-+static inline bool rt6_qualify_for_ecmp(struct rt6_info *rt)
-+{
-+	return (rt->rt6i_flags & (RTF_GATEWAY|RTF_ADDRCONF|RTF_DYNAMIC)) ==
-+	       RTF_GATEWAY;
-+}
-+
- /*
-  *	Insert routing information in a node.
-  */
-@@ -646,6 +652,7 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt,
- 	int add = (!info->nlh ||
- 		   (info->nlh->nlmsg_flags & NLM_F_CREATE));
- 	int found = 0;
-+	bool rt_can_ecmp = rt6_qualify_for_ecmp(rt);
- 
- 	ins = &fn->leaf;
- 
-@@ -691,9 +698,8 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt,
- 			 * To avoid long list, we only had siblings if the
- 			 * route have a gateway.
- 			 */
--			if (rt->rt6i_flags & RTF_GATEWAY &&
--			    !(rt->rt6i_flags & RTF_EXPIRES) &&
--			    !(iter->rt6i_flags & RTF_EXPIRES))
-+			if (rt_can_ecmp &&
-+			    rt6_qualify_for_ecmp(iter))
- 				rt->rt6i_nsiblings++;
- 		}
- 
-@@ -715,7 +721,8 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt,
- 		/* Find the first route that have the same metric */
- 		sibling = fn->leaf;
- 		while (sibling) {
--			if (sibling->rt6i_metric == rt->rt6i_metric) {
-+			if (sibling->rt6i_metric == rt->rt6i_metric &&
-+			    rt6_qualify_for_ecmp(sibling)) {
- 				list_add_tail(&rt->rt6i_siblings,
- 					      &sibling->rt6i_siblings);
- 				break;
---
-cgit v0.9.2

Deleted: genpatches-2.6/trunk/3.10/1600_CVE-2013-4127-fix-use-after-free-in-vhost_net_flush.patch
===================================================================
--- genpatches-2.6/trunk/3.10/1600_CVE-2013-4127-fix-use-after-free-in-vhost_net_flush.patch	2013-07-29 00:45:13 UTC (rev 2457)
+++ genpatches-2.6/trunk/3.10/1600_CVE-2013-4127-fix-use-after-free-in-vhost_net_flush.patch	2013-07-29 00:59:57 UTC (rev 2458)
@@ -1,56 +0,0 @@
-From dd7633ecd553a5e304d349aa6f8eb8a0417098c5 Mon Sep 17 00:00:00 2001
-From: Michael S. Tsirkin <mst@××××××.com>
-Date: Sun, 07 Jul 2013 11:26:53 +0000
-Subject: vhost-net: fix use-after-free in vhost_net_flush
-
-vhost_net_ubuf_put_and_wait has a confusing name:
-it will actually also free it's argument.
-Thus since commit 1280c27f8e29acf4af2da914e80ec27c3dbd5c01
-    "vhost-net: flush outstanding DMAs on memory change"
-vhost_net_flush tries to use the argument after passing it
-to vhost_net_ubuf_put_and_wait, this results
-in use after free.
-To fix, don't free the argument in vhost_net_ubuf_put_and_wait,
-add an new API for callers that want to free ubufs.
-
-Acked-by: Asias He <asias@××××××.com>
-Acked-by: Jason Wang <jasowang@××××××.com>
-Signed-off-by: Michael S. Tsirkin <mst@××××××.com>
-Signed-off-by: David S. Miller <davem@×××××××××.net>
----
-diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
-index f80d3dd..8ca5ac7 100644
---- a/drivers/vhost/net.c
-+++ b/drivers/vhost/net.c
-@@ -150,6 +150,11 @@ static void vhost_net_ubuf_put_and_wait(struct vhost_net_ubuf_ref *ubufs)
- {
- 	kref_put(&ubufs->kref, vhost_net_zerocopy_done_signal);
- 	wait_event(ubufs->wait, !atomic_read(&ubufs->kref.refcount));
-+}
-+
-+static void vhost_net_ubuf_put_wait_and_free(struct vhost_net_ubuf_ref *ubufs)
-+{
-+	vhost_net_ubuf_put_and_wait(ubufs);
- 	kfree(ubufs);
- }
- 
-@@ -948,7 +953,7 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd)
- 	mutex_unlock(&vq->mutex);
- 
- 	if (oldubufs) {
--		vhost_net_ubuf_put_and_wait(oldubufs);
-+		vhost_net_ubuf_put_wait_and_free(oldubufs);
- 		mutex_lock(&vq->mutex);
- 		vhost_zerocopy_signal_used(n, vq);
- 		mutex_unlock(&vq->mutex);
-@@ -966,7 +971,7 @@ err_used:
- 	rcu_assign_pointer(vq->private_data, oldsock);
- 	vhost_net_enable_vq(n, vq);
- 	if (ubufs)
--		vhost_net_ubuf_put_and_wait(ubufs);
-+		vhost_net_ubuf_put_wait_and_free(ubufs);
- err_ubufs:
- 	fput(sock->file);
- err_vq:
---
-cgit v0.9.2