From: <[email protected]>
Date: Thu, 10 Mar 2011 14:33:44 -0800

> 
> This is a note to let you know that I've just added the patch titled
> 
>     net: don't allow CAP_NET_ADMIN to load non-netdev kernel modules
> 
> to the 2.6.37-stable tree which can be found at:
>     
> http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
> 
> The filename of the patch is:
>      net-don-t-allow-cap_net_admin-to-load-non-netdev-kernel-modules.patch
> and it can be found in the queue-2.6.37 subdirectory.
> 
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <[email protected]> know about it.

Greg, I don't know how soon you'll put out a tree with this, but Stephen
Hemminger posted a necessary follow-on fix to this commit just now which
I've pushed out to net-2.6:

--------------------
>From 6dfbd87a20a737641ef228230c77f4262434fa24 Mon Sep 17 00:00:00 2001
From: stephen hemminger <[email protected]>
Date: Thu, 10 Mar 2011 11:43:19 +0000
Subject: [PATCH] ip6ip6: autoload ip6 tunnel

Add necessary alias to autoload ip6ip6 tunnel module.

Signed-off-by: Stephen Hemminger <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
---
 net/ipv6/ip6_tunnel.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 4f4483e..e528a42 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -57,6 +57,7 @@
 MODULE_AUTHOR("Ville Nuorvala");
 MODULE_DESCRIPTION("IPv6 tunneling device");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_NETDEV("ip6tnl0");
 
 #ifdef IP6_TNL_DEBUG
 #define IP6_TNL_TRACE(x...) printk(KERN_DEBUG "%s:" x "\n", __func__)
-- 
1.7.4.1

_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to