| From: Sabrina Dubroca <sd@queasysnail.net> |
| Date: Tue, 5 Jun 2018 15:01:59 +0200 |
| Subject: ip6mr: only set ip6mr_table from setsockopt when ip6mr_new_table |
| succeeds |
| |
| commit 848235edb5c93ed086700584c8ff64f6d7fc778d upstream. |
| |
| 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> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| net/ipv6/ip6mr.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/net/ipv6/ip6mr.c |
| +++ b/net/ipv6/ip6mr.c |
| @@ -1785,7 +1785,8 @@ int ip6_mroute_setsockopt(struct sock *s |
| 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; |
| } |
