Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b008b0a authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

[NET]: Marking struct pernet_operations __net_initdata was inappropriate 



It is not safe to to place struct pernet_operations in a special section.
We need struct pernet_operations to last until we call unregister_pernet_subsys.
Which doesn't happen until module unload.

So marking struct pernet_operations is a disaster for modules in two ways.
- We discard it before we call the exit method it points to.
- Because I keep struct pernet_operations on a linked list discarding
  it for compiled in code removes elements in the middle of a linked
  list and does horrible things for linked insert.

So this looks safe assuming __exit_refok is not discarded
for modules.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 72998d8c

drivers/net/loopback.c

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static __net_exit void loopback_net_exit(struct net *net) 
	unregister_netdev(dev);

}



static struct pernet_operations __net_initdata loopback_net_ops = {

static struct pernet_operations loopback_net_ops = {

       .init = loopback_net_init,

       .exit = loopback_net_exit,

};

fs/proc/proc_net.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static __net_exit void proc_net_ns_exit(struct net *net) 
	kfree(net->proc_net_root);

}



static struct pernet_operations __net_initdata proc_net_ns_ops = {

static struct pernet_operations proc_net_ns_ops = {

	.init = proc_net_ns_init,

	.exit = proc_net_ns_exit,

};

include/net/net_namespace.h

+0 −2
Original line number Diff line number Diff line
@@ -102,11 +102,9 @@ static inline void release_net(struct net *net) 
#ifdef CONFIG_NET_NS

#define __net_init

#define __net_exit

#define __net_initdata

#else

#define __net_init	__init

#define __net_exit	__exit_refok

#define __net_initdata	__initdata

#endif



struct pernet_operations {

net/core/dev.c

+3 −3
Original line number Diff line number Diff line
@@ -2668,7 +2668,7 @@ static void __net_exit dev_proc_net_exit(struct net *net) 
	proc_net_remove(net, "dev");

}



static struct pernet_operations __net_initdata dev_proc_ops = {

static struct pernet_operations dev_proc_ops = {

	.init = dev_proc_net_init,

	.exit = dev_proc_net_exit,

};
@@ -4328,7 +4328,7 @@ static void __net_exit netdev_exit(struct net *net) 
	kfree(net->dev_index_head);

}



static struct pernet_operations __net_initdata netdev_net_ops = {

static struct pernet_operations  netdev_net_ops = {

	.init = netdev_init,

	.exit = netdev_exit,

};
@@ -4359,7 +4359,7 @@ static void __net_exit default_device_exit(struct net *net) 
	rtnl_unlock();

}



static struct pernet_operations __net_initdata default_device_ops = {

static struct pernet_operations  default_device_ops = {

	.exit = default_device_exit,

};

net/core/dev_mcast.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static void __net_exit dev_mc_net_exit(struct net *net) 
	proc_net_remove(net, "dev_mcast");

}



static struct pernet_operations __net_initdata dev_mc_net_ops = {

static struct pernet_operations dev_mc_net_ops = {

	.init = dev_mc_net_init,

	.exit = dev_mc_net_exit,

};