diff options
| author | Sabrina Dubroca <sd@queasysnail.net> | 2018-06-05 15:01:59 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-05 12:26:39 -0400 |
| commit | 848235edb5c93ed086700584c8ff64f6d7fc778d (patch) | |
| tree | ad8211588a1867fe378e81e300aff1aae796f3a2 /net/ipv6 | |
| parent | 4f416db98beaef2f047709e4693b0a4c64d9bbf8 (diff) | |
| download | linux-stable-848235edb5c93ed086700584c8ff64f6d7fc778d.tar.gz linux-stable-848235edb5c93ed086700584c8ff64f6d7fc778d.tar.bz2 linux-stable-848235edb5c93ed086700584c8ff64f6d7fc778d.zip | |
ip6mr: only set ip6mr_table from setsockopt when ip6mr_new_table succeeds
Currently, raw6_sk(sk)->ip6mr_table is set unconditionally during
ip6_mroute_setsockopt(MRT6_TABLE). A subsequent attempt at the same
setsockopt will fail with -ENOENT, since we haven't actually created
that table.
A similar fix for ipv4 was included in commit 5e1859fbcc3c ("ipv4: ipmr:
various fixes and cleanups").
Fixes: d1db275dd3f6 ("ipv6: ip6mr: support multiple tables")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ip6mr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 20a419ee8000..5c57374850b3 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -1760,7 +1760,8 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, uns ret = 0; if (!ip6mr_new_table(net, v)) ret = -ENOMEM; - raw6_sk(sk)->ip6mr_table = v; + else + raw6_sk(sk)->ip6mr_table = v; rtnl_unlock(); return ret; } |