* [PATCH stable-2.6.32] Phonet: disable network namespace support
@ 2010-09-17 22:36 Rémi Denis-Courmont
2010-09-17 23:03 ` David Miller
2010-09-17 23:04 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Rémi Denis-Courmont @ 2010-09-17 22:36 UTC (permalink / raw)
To: lkml, netdev; +Cc: Rémi Denis-Courmont, Eric W. Biederman
From: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Network namespace in the Phonet socket stack causes an OOPS when a
namespace is destroyed. This occurs as the loopback exit_net handler is
called after the Phonet exit_net handler, and re-enters the Phonet
stack. I cannot think of any nice way to fix this in kernel <= 2.6.32.
For lack of a better solution, disable namespace support completely.
If you need that, upgrade to a newer kernel.
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
---
net/phonet/af_phonet.c | 4 ++++
net/phonet/pn_dev.c | 12 ++++++++++--
net/phonet/pn_netlink.c | 9 ++++++++-
3 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c
index f60c0c2..519ff9d 100644
--- a/net/phonet/af_phonet.c
+++ b/net/phonet/af_phonet.c
@@ -67,6 +67,8 @@ static int pn_socket_create(struct net *net, struct socket *sock, int protocol)
struct phonet_protocol *pnp;
int err;
+ if (!net_eq(net, &init_net))
+ return -EAFNOSUPPORT;
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
@@ -353,6 +355,8 @@ static int phonet_rcv(struct sk_buff *skb, struct net_device *dev,
struct sockaddr_pn sa;
u16 len;
+ if (!net_eq(net, &init_net))
+ goto out;
/* check we have at least a full Phonet header */
if (!pskb_pull(skb, sizeof(struct phonethdr)))
goto out;
diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c
index 5f42f30..5a2275c 100644
--- a/net/phonet/pn_dev.c
+++ b/net/phonet/pn_dev.c
@@ -246,7 +246,11 @@ static struct notifier_block phonet_device_notifier = {
/* Per-namespace Phonet devices handling */
static int phonet_init_net(struct net *net)
{
- struct phonet_net *pnn = kmalloc(sizeof(*pnn), GFP_KERNEL);
+ struct phonet_net *pnn;
+
+ if (!net_eq(net, &init_net))
+ return 0;
+ pnn = kmalloc(sizeof(*pnn), GFP_KERNEL);
if (!pnn)
return -ENOMEM;
@@ -263,9 +267,13 @@ static int phonet_init_net(struct net *net)
static void phonet_exit_net(struct net *net)
{
- struct phonet_net *pnn = net_generic(net, phonet_net_id);
+ struct phonet_net *pnn;
struct net_device *dev;
+ if (!net_eq(net, &init_net))
+ return;
+ pnn = net_generic(net, phonet_net_id);
+
rtnl_lock();
for_each_netdev(net, dev)
phonet_device_destroy(dev);
diff --git a/net/phonet/pn_netlink.c b/net/phonet/pn_netlink.c
index d21fd35..7acab1e 100644
--- a/net/phonet/pn_netlink.c
+++ b/net/phonet/pn_netlink.c
@@ -68,6 +68,8 @@ static int addr_doit(struct sk_buff *skb, struct nlmsghdr *nlh, void *attr)
int err;
u8 pnaddr;
+ if (!net_eq(net, &init_net))
+ return -EOPNOTSUPP;
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
@@ -124,12 +126,16 @@ nla_put_failure:
static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
{
+ struct net *net = sock_net(skb->sk);
struct phonet_device_list *pndevs;
struct phonet_device *pnd;
int dev_idx = 0, dev_start_idx = cb->args[0];
int addr_idx = 0, addr_start_idx = cb->args[1];
- pndevs = phonet_device_list(sock_net(skb->sk));
+ if (!net_eq(net, &init_net))
+ goto skip;
+
+ pndevs = phonet_device_list(net);
spin_lock_bh(&pndevs->lock);
list_for_each_entry(pnd, &pndevs->list, list) {
u8 addr;
@@ -154,6 +160,7 @@ static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
out:
spin_unlock_bh(&pndevs->lock);
+skip:
cb->args[0] = dev_idx;
cb->args[1] = addr_idx;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH stable-2.6.32] Phonet: disable network namespace support
2010-09-17 22:36 [PATCH stable-2.6.32] Phonet: disable network namespace support Rémi Denis-Courmont
@ 2010-09-17 23:03 ` David Miller
2010-09-17 23:04 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2010-09-17 23:03 UTC (permalink / raw)
To: remi; +Cc: lkml, netdev, remi.denis-courmont, ebiederm
From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sat, 18 Sep 2010 01:36:46 +0300
> From: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
>
> Network namespace in the Phonet socket stack causes an OOPS when a
> namespace is destroyed. This occurs as the loopback exit_net handler is
> called after the Phonet exit_net handler, and re-enters the Phonet
> stack. I cannot think of any nice way to fix this in kernel <= 2.6.32.
>
> For lack of a better solution, disable namespace support completely.
> If you need that, upgrade to a newer kernel.
>
> Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
> Cc: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH stable-2.6.32] Phonet: disable network namespace support
2010-09-17 22:36 [PATCH stable-2.6.32] Phonet: disable network namespace support Rémi Denis-Courmont
2010-09-17 23:03 ` David Miller
@ 2010-09-17 23:04 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2010-09-17 23:04 UTC (permalink / raw)
To: remi; +Cc: linux-kernel, netdev, remi.denis-courmont, ebiederm, stable
From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sat, 18 Sep 2010 01:36:46 +0300
> From: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
>
> Network namespace in the Phonet socket stack causes an OOPS when a
> namespace is destroyed. This occurs as the loopback exit_net handler is
> called after the Phonet exit_net handler, and re-enters the Phonet
> stack. I cannot think of any nice way to fix this in kernel <= 2.6.32.
>
> For lack of a better solution, disable namespace support completely.
> If you need that, upgrade to a newer kernel.
>
> Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
> Cc: Eric W. Biederman <ebiederm@xmission.com>
"lkml" address fixed, and -stable CC: added this time, please don't
omit that if you want to submit stable networking patches that have no
upstream counterpart.
Acked-by: David S. Miller <davem@davemloft.net>
> ---
> net/phonet/af_phonet.c | 4 ++++
> net/phonet/pn_dev.c | 12 ++++++++++--
> net/phonet/pn_netlink.c | 9 ++++++++-
> 3 files changed, 22 insertions(+), 3 deletions(-)
>
> diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c
> index f60c0c2..519ff9d 100644
> --- a/net/phonet/af_phonet.c
> +++ b/net/phonet/af_phonet.c
> @@ -67,6 +67,8 @@ static int pn_socket_create(struct net *net, struct socket *sock, int protocol)
> struct phonet_protocol *pnp;
> int err;
>
> + if (!net_eq(net, &init_net))
> + return -EAFNOSUPPORT;
> if (!capable(CAP_SYS_ADMIN))
> return -EPERM;
>
> @@ -353,6 +355,8 @@ static int phonet_rcv(struct sk_buff *skb, struct net_device *dev,
> struct sockaddr_pn sa;
> u16 len;
>
> + if (!net_eq(net, &init_net))
> + goto out;
> /* check we have at least a full Phonet header */
> if (!pskb_pull(skb, sizeof(struct phonethdr)))
> goto out;
> diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c
> index 5f42f30..5a2275c 100644
> --- a/net/phonet/pn_dev.c
> +++ b/net/phonet/pn_dev.c
> @@ -246,7 +246,11 @@ static struct notifier_block phonet_device_notifier = {
> /* Per-namespace Phonet devices handling */
> static int phonet_init_net(struct net *net)
> {
> - struct phonet_net *pnn = kmalloc(sizeof(*pnn), GFP_KERNEL);
> + struct phonet_net *pnn;
> +
> + if (!net_eq(net, &init_net))
> + return 0;
> + pnn = kmalloc(sizeof(*pnn), GFP_KERNEL);
> if (!pnn)
> return -ENOMEM;
>
> @@ -263,9 +267,13 @@ static int phonet_init_net(struct net *net)
>
> static void phonet_exit_net(struct net *net)
> {
> - struct phonet_net *pnn = net_generic(net, phonet_net_id);
> + struct phonet_net *pnn;
> struct net_device *dev;
>
> + if (!net_eq(net, &init_net))
> + return;
> + pnn = net_generic(net, phonet_net_id);
> +
> rtnl_lock();
> for_each_netdev(net, dev)
> phonet_device_destroy(dev);
> diff --git a/net/phonet/pn_netlink.c b/net/phonet/pn_netlink.c
> index d21fd35..7acab1e 100644
> --- a/net/phonet/pn_netlink.c
> +++ b/net/phonet/pn_netlink.c
> @@ -68,6 +68,8 @@ static int addr_doit(struct sk_buff *skb, struct nlmsghdr *nlh, void *attr)
> int err;
> u8 pnaddr;
>
> + if (!net_eq(net, &init_net))
> + return -EOPNOTSUPP;
> if (!capable(CAP_SYS_ADMIN))
> return -EPERM;
>
> @@ -124,12 +126,16 @@ nla_put_failure:
>
> static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
> {
> + struct net *net = sock_net(skb->sk);
> struct phonet_device_list *pndevs;
> struct phonet_device *pnd;
> int dev_idx = 0, dev_start_idx = cb->args[0];
> int addr_idx = 0, addr_start_idx = cb->args[1];
>
> - pndevs = phonet_device_list(sock_net(skb->sk));
> + if (!net_eq(net, &init_net))
> + goto skip;
> +
> + pndevs = phonet_device_list(net);
> spin_lock_bh(&pndevs->lock);
> list_for_each_entry(pnd, &pndevs->list, list) {
> u8 addr;
> @@ -154,6 +160,7 @@ static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
>
> out:
> spin_unlock_bh(&pndevs->lock);
> +skip:
> cb->args[0] = dev_idx;
> cb->args[1] = addr_idx;
>
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-09-17 23:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-17 22:36 [PATCH stable-2.6.32] Phonet: disable network namespace support Rémi Denis-Courmont
2010-09-17 23:03 ` David Miller
2010-09-17 23:04 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).