lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETNS]: Add netns to nl_info structure.

Browse Source 
nl_info is used to track the end-user destination of routing change
notification. This is a natural object to hold a namespace on. Place
it there and utilize the context in the appropriate places.

Acked-by: Benjamin Thery <benjamin.thery@bull.net>
Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev
2008-01-10 03:26:13 -08:00
committed by David S. Miller
parent 6b175b26c1
commit 4d1169c1e7
5 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/netlink.h
View File

@@ -217,6 +217,7 @@ struct nla_policy {
*/ */
struct nl_info { struct nl_info {
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
struct net *nl_net;
u32 pid; u32 pid;
}; };

5
net/ipv4/fib_frontend.c
View File

@@ -310,6 +310,7 @@ static int rtentry_to_fib_config(int cmd, struct rtentry *rt,
int plen; int plen;
memset(cfg, 0, sizeof(*cfg)); memset(cfg, 0, sizeof(*cfg));
cfg->fc_nlinfo.nl_net = &init_net;
if (rt->rt_dst.sa_family != AF_INET) if (rt->rt_dst.sa_family != AF_INET)
return -EAFNOSUPPORT; return -EAFNOSUPPORT;
@@ -516,6 +517,7 @@ static int rtm_to_fib_config(struct sk_buff *skb, struct nlmsghdr *nlh,
cfg->fc_nlinfo.pid = NETLINK_CB(skb).pid; cfg->fc_nlinfo.pid = NETLINK_CB(skb).pid;
cfg->fc_nlinfo.nlh = nlh; cfg->fc_nlinfo.nlh = nlh;
cfg->fc_nlinfo.nl_net = &init_net;
if (cfg->fc_type > RTN_MAX) { if (cfg->fc_type > RTN_MAX) {
err = -EINVAL; err = -EINVAL;
@@ -670,6 +672,9 @@ static void fib_magic(int cmd, int type, __be32 dst, int dst_len, struct in_ifad
.fc_prefsrc = ifa->ifa_local, .fc_prefsrc = ifa->ifa_local,
.fc_oif = ifa->ifa_dev->dev->ifindex, .fc_oif = ifa->ifa_dev->dev->ifindex,
.fc_nlflags = NLM_F_CREATE | NLM_F_APPEND, .fc_nlflags = NLM_F_CREATE | NLM_F_APPEND,
.fc_nlinfo = {
.nl_net = &init_net,
},
}; };
if (type == RTN_UNICAST) if (type == RTN_UNICAST)

16
net/ipv4/fib_semantics.c
View File

@@ -320,11 +320,11 @@ void rtmsg_fib(int event, __be32 key, struct fib_alias *fa,
kfree_skb(skb); kfree_skb(skb);
goto errout; goto errout;
} }
err = rtnl_notify(skb, &init_net, info->pid, RTNLGRP_IPV4_ROUTE, err = rtnl_notify(skb, info->nl_net, info->pid, RTNLGRP_IPV4_ROUTE,
info->nlh, GFP_KERNEL); info->nlh, GFP_KERNEL);
errout: errout:
if (err < 0) if (err < 0)
rtnl_set_sk_err(&init_net, RTNLGRP_IPV4_ROUTE, err); rtnl_set_sk_err(info->nl_net, RTNLGRP_IPV4_ROUTE, err);
} }
/* Return the first fib alias matching TOS with /* Return the first fib alias matching TOS with
@@ -531,9 +531,11 @@ static int fib_check_nh(struct fib_config *cfg, struct fib_info *fi,
if (cfg->fc_scope >= RT_SCOPE_LINK) if (cfg->fc_scope >= RT_SCOPE_LINK)
return -EINVAL; return -EINVAL;
if (inet_addr_type(&init_net, nh->nh_gw) != RTN_UNICAST) if (inet_addr_type(cfg->fc_nlinfo.nl_net,
nh->nh_gw) != RTN_UNICAST)
return -EINVAL; return -EINVAL;
if ((dev = __dev_get_by_index(&init_net, nh->nh_oif)) == NULL) if ((dev = __dev_get_by_index(cfg->fc_nlinfo.nl_net,
nh->nh_oif)) == NULL)
return -ENODEV; return -ENODEV;
if (!(dev->flags&IFF_UP)) if (!(dev->flags&IFF_UP))
return -ENETDOWN; return -ENETDOWN;
@@ -795,7 +797,8 @@ struct fib_info *fib_create_info(struct fib_config *cfg)
if (nhs != 1 || nh->nh_gw) if (nhs != 1 || nh->nh_gw)
goto err_inval; goto err_inval;
nh->nh_scope = RT_SCOPE_NOWHERE; nh->nh_scope = RT_SCOPE_NOWHERE;
nh->nh_dev = dev_get_by_index(&init_net, fi->fib_nh->nh_oif); nh->nh_dev = dev_get_by_index(cfg->fc_nlinfo.nl_net,
fi->fib_nh->nh_oif);
err = -ENODEV; err = -ENODEV;
if (nh->nh_dev == NULL) if (nh->nh_dev == NULL)
goto failure; goto failure;
@@ -809,7 +812,8 @@ struct fib_info *fib_create_info(struct fib_config *cfg)
if (fi->fib_prefsrc) { if (fi->fib_prefsrc) {
if (cfg->fc_type != RTN_LOCAL || !cfg->fc_dst || if (cfg->fc_type != RTN_LOCAL || !cfg->fc_dst ||
fi->fib_prefsrc != cfg->fc_dst) fi->fib_prefsrc != cfg->fc_dst)
if (inet_addr_type(&init_net, fi->fib_prefsrc) != RTN_LOCAL) if (inet_addr_type(cfg->fc_nlinfo.nl_net,
fi->fib_prefsrc) != RTN_LOCAL)
goto err_inval; goto err_inval;
} }

4
net/ipv6/ip6_fib.c
View File

@@ -1314,7 +1314,9 @@ static int fib6_walk(struct fib6_walker_t *w)
static int fib6_clean_node(struct fib6_walker_t *w) static int fib6_clean_node(struct fib6_walker_t *w)
{ {
struct nl_info info = {}; struct nl_info info = {
.nl_net = &init_net,
};
int res; int res;
struct rt6_info *rt; struct rt6_info *rt;
struct fib6_cleaner_t *c = container_of(w, struct fib6_cleaner_t, w); struct fib6_cleaner_t *c = container_of(w, struct fib6_cleaner_t, w);

8
net/ipv6/route.c
View File

@@ -601,7 +601,9 @@ static int __ip6_ins_rt(struct rt6_info *rt, struct nl_info *info)
int ip6_ins_rt(struct rt6_info *rt) int ip6_ins_rt(struct rt6_info *rt)
{ {
struct nl_info info = {}; struct nl_info info = {
.nl_net = &init_net,
};
return __ip6_ins_rt(rt, &info); return __ip6_ins_rt(rt, &info);
} }
@@ -1259,7 +1261,9 @@ static int __ip6_del_rt(struct rt6_info *rt, struct nl_info *info)
int ip6_del_rt(struct rt6_info *rt) int ip6_del_rt(struct rt6_info *rt)
{ {
struct nl_info info = {}; struct nl_info info = {
.nl_net = &init_net,
};
return __ip6_del_rt(rt, &info); return __ip6_del_rt(rt, &info);
} }