|
@@ -35,7 +35,6 @@
|
|
#include <linux/security.h>
|
|
#include <linux/security.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/if_addr.h>
|
|
#include <linux/if_addr.h>
|
|
-#include <linux/nsproxy.h>
|
|
|
|
|
|
|
|
#include <asm/uaccess.h>
|
|
#include <asm/uaccess.h>
|
|
#include <asm/system.h>
|
|
#include <asm/system.h>
|
|
@@ -52,6 +51,7 @@
|
|
#include <net/pkt_sched.h>
|
|
#include <net/pkt_sched.h>
|
|
#include <net/fib_rules.h>
|
|
#include <net/fib_rules.h>
|
|
#include <net/rtnetlink.h>
|
|
#include <net/rtnetlink.h>
|
|
|
|
+#include <net/net_namespace.h>
|
|
|
|
|
|
struct rtnl_link
|
|
struct rtnl_link
|
|
{
|
|
{
|
|
@@ -725,25 +725,6 @@ static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = {
|
|
[IFLA_INFO_DATA] = { .type = NLA_NESTED },
|
|
[IFLA_INFO_DATA] = { .type = NLA_NESTED },
|
|
};
|
|
};
|
|
|
|
|
|
-static struct net *get_net_ns_by_pid(pid_t pid)
|
|
|
|
-{
|
|
|
|
- struct task_struct *tsk;
|
|
|
|
- struct net *net;
|
|
|
|
-
|
|
|
|
- /* Lookup the network namespace */
|
|
|
|
- net = ERR_PTR(-ESRCH);
|
|
|
|
- rcu_read_lock();
|
|
|
|
- tsk = find_task_by_vpid(pid);
|
|
|
|
- if (tsk) {
|
|
|
|
- struct nsproxy *nsproxy;
|
|
|
|
- nsproxy = task_nsproxy(tsk);
|
|
|
|
- if (nsproxy)
|
|
|
|
- net = get_net(nsproxy->net_ns);
|
|
|
|
- }
|
|
|
|
- rcu_read_unlock();
|
|
|
|
- return net;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
static int validate_linkmsg(struct net_device *dev, struct nlattr *tb[])
|
|
static int validate_linkmsg(struct net_device *dev, struct nlattr *tb[])
|
|
{
|
|
{
|
|
if (dev) {
|
|
if (dev) {
|