Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[NETNS][RAW]: Eliminate explicit init_net references.

Browse source 
Happily, in all the rest places (->bind callbacks only), that require the
struct net, we have a socket, so get the net from it.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov 2008-01-14 05:36:27 -08:00 • committed by David S. Miller
parent f51d599fbe
commit e5ba31f11f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/ipv4/raw.c
View file

@ -625,7 +625,7 @@ static int raw_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
if (sk->sk_state != TCP_CLOSE || addr_len < sizeof(struct sockaddr_in)) if (sk->sk_state != TCP_CLOSE || addr_len < sizeof(struct sockaddr_in))
goto out; goto out;
chk_addr_ret = inet_addr_type(&init_net, addr->sin_addr.s_addr); chk_addr_ret = inet_addr_type(sk->sk_net, addr->sin_addr.s_addr);
ret = -EADDRNOTAVAIL; ret = -EADDRNOTAVAIL;
if (addr->sin_addr.s_addr && chk_addr_ret != RTN_LOCAL && if (addr->sin_addr.s_addr && chk_addr_ret != RTN_LOCAL &&
chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST) chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST)

4
net/ipv6/raw.c
View file

@ -291,7 +291,7 @@ static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
if (!sk->sk_bound_dev_if) if (!sk->sk_bound_dev_if)
goto out; goto out;
dev = dev_get_by_index(&init_net, sk->sk_bound_dev_if); dev = dev_get_by_index(sk->sk_net, sk->sk_bound_dev_if);
if (!dev) { if (!dev) {
err = -ENODEV; err = -ENODEV;
goto out; goto out;
@ -304,7 +304,7 @@ static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
v4addr = LOOPBACK4_IPV6; v4addr = LOOPBACK4_IPV6;
if (!(addr_type & IPV6_ADDR_MULTICAST)) { if (!(addr_type & IPV6_ADDR_MULTICAST)) {
err = -EADDRNOTAVAIL; err = -EADDRNOTAVAIL;
if (!ipv6_chk_addr(&init_net, &addr->sin6_addr, if (!ipv6_chk_addr(sk->sk_net, &addr->sin6_addr,
dev, 0)) { dev, 0)) {
if (dev) if (dev)
dev_put(dev); dev_put(dev);