Reenabled linux-xen, added patches for Xen Kernel Version 2.6.27.31,

[people/teissler/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.suse / SoN-03-net-ipv6-route-cleanup.patch

diff --git a/src/patches/suse-2.6.27.31/patches.suse/SoN-03-net-ipv6-route-cleanup.patch b/src/patches/suse-2.6.27.31/patches.suse/SoN-03-net-ipv6-route-cleanup.patch
new file mode 100644 (file)
index 0000000..c84c502
--- /dev/null
+++ b/src/patches/suse-2.6.27.31/patches.suse/SoN-03-net-ipv6-route-cleanup.patch
@@ -0,0 +1,59 @@
+From: Peter Zijlstra <a.p.zijlstra@chello.nl> 
+Subject: net: ipv6: clean up ip6_route_net_init() error handling
+Patch-mainline: No
+References: FATE#303834
+
+ip6_route_net_init() error handling looked less than solid, fix 'er up.
+
+Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
+Acked-by: Neil Brown <neilb@suse.de>
+Acked-by: Suresh Jayaraman <sjayaraman@suse.de>
+
+---
+ net/ipv6/route.c |   19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+Index: linux-2.6.26/net/ipv6/route.c
+===================================================================
+--- linux-2.6.26.orig/net/ipv6/route.c
++++ linux-2.6.26/net/ipv6/route.c
+@@ -2611,10 +2611,8 @@ static int ip6_route_net_init(struct net
+       net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
+                                              sizeof(*net->ipv6.ip6_prohibit_entry),
+                                              GFP_KERNEL);
+-      if (!net->ipv6.ip6_prohibit_entry) {
+-              kfree(net->ipv6.ip6_null_entry);
+-              goto out;
+-      }
++      if (!net->ipv6.ip6_prohibit_entry)
++              goto out_ip6_null_entry;
+       net->ipv6.ip6_prohibit_entry->u.dst.path =
+               (struct dst_entry *)net->ipv6.ip6_prohibit_entry;
+       net->ipv6.ip6_prohibit_entry->u.dst.ops = net->ipv6.ip6_dst_ops;
+@@ -2622,11 +2620,8 @@ static int ip6_route_net_init(struct net
+       net->ipv6.ip6_blk_hole_entry = kmemdup(&ip6_blk_hole_entry_template,
+                                              sizeof(*net->ipv6.ip6_blk_hole_entry),
+                                              GFP_KERNEL);
+-      if (!net->ipv6.ip6_blk_hole_entry) {
+-              kfree(net->ipv6.ip6_null_entry);
+-              kfree(net->ipv6.ip6_prohibit_entry);
+-              goto out;
+-      }
++      if (!net->ipv6.ip6_blk_hole_entry)
++              goto out_ip6_prohibit_entry;
+       net->ipv6.ip6_blk_hole_entry->u.dst.path =
+               (struct dst_entry *)net->ipv6.ip6_blk_hole_entry;
+       net->ipv6.ip6_blk_hole_entry->u.dst.ops = net->ipv6.ip6_dst_ops;
+@@ -2642,6 +2637,12 @@ static int ip6_route_net_init(struct net
+ out:
+       return ret;
+ 
++#ifdef CONFIG_IPV6_MULTIPLE_TABLES
++out_ip6_prohibit_entry:
++      kfree(net->ipv6.ip6_prohibit_entry);
++out_ip6_null_entry:
++      kfree(net->ipv6.ip6_null_entry);
++#endif
+ out_ip6_dst_ops:
+       release_net(net->ipv6.ip6_dst_ops->dst_net);
+       kfree(net->ipv6.ip6_dst_ops);