Skip to content

Commit 86bd68b

Browse files
NicolasDichteldavem330
authored andcommitted
sit: fix tunnel update via netlink
The device can stand in another netns, hence we need to do the lookup in netns tunnel->net. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 0e07647 commit 86bd68b

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

net/ipv6/sit.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1426,9 +1426,9 @@ static int ipip6_newlink(struct net *src_net, struct net_device *dev,
14261426
static int ipip6_changelink(struct net_device *dev, struct nlattr *tb[],
14271427
struct nlattr *data[])
14281428
{
1429-
struct ip_tunnel *t;
1429+
struct ip_tunnel *t = netdev_priv(dev);
14301430
struct ip_tunnel_parm p;
1431-
struct net *net = dev_net(dev);
1431+
struct net *net = t->net;
14321432
struct sit_net *sitn = net_generic(net, sit_net_id);
14331433
#ifdef CONFIG_IPV6_SIT_6RD
14341434
struct ip_tunnel_6rd ip6rd;

0 commit comments

Comments
 (0)