|
@@ -289,6 +289,7 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size)
|
|
|
struct rtable *rt;
|
|
|
struct iphdr *pip;
|
|
|
struct igmpv3_report *pig;
|
|
|
+ struct net *net = dev_net(dev);
|
|
|
|
|
|
skb = alloc_skb(size + LL_ALLOCATED_SPACE(dev), GFP_ATOMIC);
|
|
|
if (skb == NULL)
|
|
@@ -299,7 +300,7 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size)
|
|
|
.nl_u = { .ip4_u = {
|
|
|
.daddr = IGMPV3_ALL_MCR } },
|
|
|
.proto = IPPROTO_IGMP };
|
|
|
- if (ip_route_output_key(&init_net, &rt, &fl)) {
|
|
|
+ if (ip_route_output_key(net, &rt, &fl)) {
|
|
|
kfree_skb(skb);
|
|
|
return NULL;
|
|
|
}
|
|
@@ -629,6 +630,7 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc,
|
|
|
struct igmphdr *ih;
|
|
|
struct rtable *rt;
|
|
|
struct net_device *dev = in_dev->dev;
|
|
|
+ struct net *net = dev_net(dev);
|
|
|
__be32 group = pmc ? pmc->multiaddr : 0;
|
|
|
__be32 dst;
|
|
|
|
|
@@ -643,7 +645,7 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc,
|
|
|
struct flowi fl = { .oif = dev->ifindex,
|
|
|
.nl_u = { .ip4_u = { .daddr = dst } },
|
|
|
.proto = IPPROTO_IGMP };
|
|
|
- if (ip_route_output_key(&init_net, &rt, &fl))
|
|
|
+ if (ip_route_output_key(net, &rt, &fl))
|
|
|
return -1;
|
|
|
}
|
|
|
if (rt->rt_src == 0) {
|
|
@@ -1196,9 +1198,6 @@ void ip_mc_inc_group(struct in_device *in_dev, __be32 addr)
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
- if (!net_eq(dev_net(in_dev->dev), &init_net))
|
|
|
- return;
|
|
|
-
|
|
|
for (im=in_dev->mc_list; im; im=im->next) {
|
|
|
if (im->multiaddr == addr) {
|
|
|
im->users++;
|
|
@@ -1278,9 +1277,6 @@ void ip_mc_dec_group(struct in_device *in_dev, __be32 addr)
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
- if (!net_eq(dev_net(in_dev->dev), &init_net))
|
|
|
- return;
|
|
|
-
|
|
|
for (ip=&in_dev->mc_list; (i=*ip)!=NULL; ip=&i->next) {
|
|
|
if (i->multiaddr==addr) {
|
|
|
if (--i->users == 0) {
|
|
@@ -1308,9 +1304,6 @@ void ip_mc_down(struct in_device *in_dev)
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
- if (!net_eq(dev_net(in_dev->dev), &init_net))
|
|
|
- return;
|
|
|
-
|
|
|
for (i=in_dev->mc_list; i; i=i->next)
|
|
|
igmp_group_dropped(i);
|
|
|
|
|
@@ -1331,9 +1324,6 @@ void ip_mc_init_dev(struct in_device *in_dev)
|
|
|
{
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
- if (!net_eq(dev_net(in_dev->dev), &init_net))
|
|
|
- return;
|
|
|
-
|
|
|
in_dev->mc_tomb = NULL;
|
|
|
#ifdef CONFIG_IP_MULTICAST
|
|
|
in_dev->mr_gq_running = 0;
|
|
@@ -1357,9 +1347,6 @@ void ip_mc_up(struct in_device *in_dev)
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
- if (!net_eq(dev_net(in_dev->dev), &init_net))
|
|
|
- return;
|
|
|
-
|
|
|
ip_mc_inc_group(in_dev, IGMP_ALL_HOSTS);
|
|
|
|
|
|
for (i=in_dev->mc_list; i; i=i->next)
|
|
@@ -1376,9 +1363,6 @@ void ip_mc_destroy_dev(struct in_device *in_dev)
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
- if (!net_eq(dev_net(in_dev->dev), &init_net))
|
|
|
- return;
|
|
|
-
|
|
|
/* Deactivate timers */
|
|
|
ip_mc_down(in_dev);
|
|
|
|
|
@@ -1395,7 +1379,7 @@ void ip_mc_destroy_dev(struct in_device *in_dev)
|
|
|
write_unlock_bh(&in_dev->mc_list_lock);
|
|
|
}
|
|
|
|
|
|
-static struct in_device * ip_mc_find_dev(struct ip_mreqn *imr)
|
|
|
+static struct in_device *ip_mc_find_dev(struct net *net, struct ip_mreqn *imr)
|
|
|
{
|
|
|
struct flowi fl = { .nl_u = { .ip4_u =
|
|
|
{ .daddr = imr->imr_multiaddr.s_addr } } };
|
|
@@ -1404,19 +1388,19 @@ static struct in_device * ip_mc_find_dev(struct ip_mreqn *imr)
|
|
|
struct in_device *idev = NULL;
|
|
|
|
|
|
if (imr->imr_ifindex) {
|
|
|
- idev = inetdev_by_index(&init_net, imr->imr_ifindex);
|
|
|
+ idev = inetdev_by_index(net, imr->imr_ifindex);
|
|
|
if (idev)
|
|
|
__in_dev_put(idev);
|
|
|
return idev;
|
|
|
}
|
|
|
if (imr->imr_address.s_addr) {
|
|
|
- dev = ip_dev_find(&init_net, imr->imr_address.s_addr);
|
|
|
+ dev = ip_dev_find(net, imr->imr_address.s_addr);
|
|
|
if (!dev)
|
|
|
return NULL;
|
|
|
dev_put(dev);
|
|
|
}
|
|
|
|
|
|
- if (!dev && !ip_route_output_key(&init_net, &rt, &fl)) {
|
|
|
+ if (!dev && !ip_route_output_key(net, &rt, &fl)) {
|
|
|
dev = rt->u.dst.dev;
|
|
|
ip_rt_put(rt);
|
|
|
}
|
|
@@ -1754,18 +1738,16 @@ int ip_mc_join_group(struct sock *sk , struct ip_mreqn *imr)
|
|
|
struct ip_mc_socklist *iml=NULL, *i;
|
|
|
struct in_device *in_dev;
|
|
|
struct inet_sock *inet = inet_sk(sk);
|
|
|
+ struct net *net = sock_net(sk);
|
|
|
int ifindex;
|
|
|
int count = 0;
|
|
|
|
|
|
if (!ipv4_is_multicast(addr))
|
|
|
return -EINVAL;
|
|
|
|
|
|
- if (!net_eq(sock_net(sk), &init_net))
|
|
|
- return -EPROTONOSUPPORT;
|
|
|
-
|
|
|
rtnl_lock();
|
|
|
|
|
|
- in_dev = ip_mc_find_dev(imr);
|
|
|
+ in_dev = ip_mc_find_dev(net, imr);
|
|
|
|
|
|
if (!in_dev) {
|
|
|
iml = NULL;
|
|
@@ -1827,15 +1809,13 @@ int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr)
|
|
|
struct inet_sock *inet = inet_sk(sk);
|
|
|
struct ip_mc_socklist *iml, **imlp;
|
|
|
struct in_device *in_dev;
|
|
|
+ struct net *net = sock_net(sk);
|
|
|
__be32 group = imr->imr_multiaddr.s_addr;
|
|
|
u32 ifindex;
|
|
|
int ret = -EADDRNOTAVAIL;
|
|
|
|
|
|
- if (!net_eq(sock_net(sk), &init_net))
|
|
|
- return -EPROTONOSUPPORT;
|
|
|
-
|
|
|
rtnl_lock();
|
|
|
- in_dev = ip_mc_find_dev(imr);
|
|
|
+ in_dev = ip_mc_find_dev(net, imr);
|
|
|
ifindex = imr->imr_ifindex;
|
|
|
for (imlp = &inet->mc_list; (iml = *imlp) != NULL; imlp = &iml->next) {
|
|
|
if (iml->multi.imr_multiaddr.s_addr != group)
|
|
@@ -1873,21 +1853,19 @@ int ip_mc_source(int add, int omode, struct sock *sk, struct
|
|
|
struct in_device *in_dev = NULL;
|
|
|
struct inet_sock *inet = inet_sk(sk);
|
|
|
struct ip_sf_socklist *psl;
|
|
|
+ struct net *net = sock_net(sk);
|
|
|
int leavegroup = 0;
|
|
|
int i, j, rv;
|
|
|
|
|
|
if (!ipv4_is_multicast(addr))
|
|
|
return -EINVAL;
|
|
|
|
|
|
- if (!net_eq(sock_net(sk), &init_net))
|
|
|
- return -EPROTONOSUPPORT;
|
|
|
-
|
|
|
rtnl_lock();
|
|
|
|
|
|
imr.imr_multiaddr.s_addr = mreqs->imr_multiaddr;
|
|
|
imr.imr_address.s_addr = mreqs->imr_interface;
|
|
|
imr.imr_ifindex = ifindex;
|
|
|
- in_dev = ip_mc_find_dev(&imr);
|
|
|
+ in_dev = ip_mc_find_dev(net, &imr);
|
|
|
|
|
|
if (!in_dev) {
|
|
|
err = -ENODEV;
|
|
@@ -2007,6 +1985,7 @@ int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf, int ifindex)
|
|
|
struct in_device *in_dev;
|
|
|
struct inet_sock *inet = inet_sk(sk);
|
|
|
struct ip_sf_socklist *newpsl, *psl;
|
|
|
+ struct net *net = sock_net(sk);
|
|
|
int leavegroup = 0;
|
|
|
|
|
|
if (!ipv4_is_multicast(addr))
|
|
@@ -2015,15 +1994,12 @@ int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf, int ifindex)
|
|
|
msf->imsf_fmode != MCAST_EXCLUDE)
|
|
|
return -EINVAL;
|
|
|
|
|
|
- if (!net_eq(sock_net(sk), &init_net))
|
|
|
- return -EPROTONOSUPPORT;
|
|
|
-
|
|
|
rtnl_lock();
|
|
|
|
|
|
imr.imr_multiaddr.s_addr = msf->imsf_multiaddr;
|
|
|
imr.imr_address.s_addr = msf->imsf_interface;
|
|
|
imr.imr_ifindex = ifindex;
|
|
|
- in_dev = ip_mc_find_dev(&imr);
|
|
|
+ in_dev = ip_mc_find_dev(net, &imr);
|
|
|
|
|
|
if (!in_dev) {
|
|
|
err = -ENODEV;
|
|
@@ -2094,19 +2070,17 @@ int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf,
|
|
|
struct in_device *in_dev;
|
|
|
struct inet_sock *inet = inet_sk(sk);
|
|
|
struct ip_sf_socklist *psl;
|
|
|
+ struct net *net = sock_net(sk);
|
|
|
|
|
|
if (!ipv4_is_multicast(addr))
|
|
|
return -EINVAL;
|
|
|
|
|
|
- if (!net_eq(sock_net(sk), &init_net))
|
|
|
- return -EPROTONOSUPPORT;
|
|
|
-
|
|
|
rtnl_lock();
|
|
|
|
|
|
imr.imr_multiaddr.s_addr = msf->imsf_multiaddr;
|
|
|
imr.imr_address.s_addr = msf->imsf_interface;
|
|
|
imr.imr_ifindex = 0;
|
|
|
- in_dev = ip_mc_find_dev(&imr);
|
|
|
+ in_dev = ip_mc_find_dev(net, &imr);
|
|
|
|
|
|
if (!in_dev) {
|
|
|
err = -ENODEV;
|
|
@@ -2163,9 +2137,6 @@ int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf,
|
|
|
if (!ipv4_is_multicast(addr))
|
|
|
return -EINVAL;
|
|
|
|
|
|
- if (!net_eq(sock_net(sk), &init_net))
|
|
|
- return -EPROTONOSUPPORT;
|
|
|
-
|
|
|
rtnl_lock();
|
|
|
|
|
|
err = -EADDRNOTAVAIL;
|
|
@@ -2246,19 +2217,17 @@ void ip_mc_drop_socket(struct sock *sk)
|
|
|
{
|
|
|
struct inet_sock *inet = inet_sk(sk);
|
|
|
struct ip_mc_socklist *iml;
|
|
|
+ struct net *net = sock_net(sk);
|
|
|
|
|
|
if (inet->mc_list == NULL)
|
|
|
return;
|
|
|
|
|
|
- if (!net_eq(sock_net(sk), &init_net))
|
|
|
- return;
|
|
|
-
|
|
|
rtnl_lock();
|
|
|
while ((iml = inet->mc_list) != NULL) {
|
|
|
struct in_device *in_dev;
|
|
|
inet->mc_list = iml->next;
|
|
|
|
|
|
- in_dev = inetdev_by_index(&init_net, iml->multi.imr_ifindex);
|
|
|
+ in_dev = inetdev_by_index(net, iml->multi.imr_ifindex);
|
|
|
(void) ip_mc_leave_src(sk, iml, in_dev);
|
|
|
if (in_dev != NULL) {
|
|
|
ip_mc_dec_group(in_dev, iml->multi.imr_multiaddr.s_addr);
|