iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ip6mr: only set ip6mr_table from setsockopt when ip6mr_new_table succeeds

Browse Source 
[ Upstream commit 848235edb5 ]

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 5e1859fbcc ("ipv4: ipmr:
various fixes and cleanups").

Fixes: d1db275dd3 ("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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sabrina Dubroca
2018-06-05 15:01:59 +02:00
committed by Greg Kroah-Hartman
parent 489f1f04a6
commit 53075e7abd
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/ipv6/ip6mr.c
View File

@ -1787,7 +1787,8 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, uns
ret = 0; ret = 0;
if (!ip6mr_new_table(net, v)) if (!ip6mr_new_table(net, v))
ret = -ENOMEM; ret = -ENOMEM;
raw6_sk(sk)->ip6mr_table = v; else
raw6_sk(sk)->ip6mr_table = v;
rtnl_unlock(); rtnl_unlock();
return ret; return ret;
} }