Commit 8c79f730 authored Jun 05, 2018 by Sabrina Dubroca Committed by Greg Kroah-Hartman Jun 13, 2018

ip6mr: only set ip6mr_table from setsockopt when ip6mr_new_table succeeds



[ Upstream commit 848235edb5c93ed086700584c8ff64f6d7fc778d ]

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

Fixes: d1db275d ("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>

parent 843e5ed6

net/ipv6/ip6mr.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1788,6 +1788,7 @@ int ip6_mroute_setsockopt(struct sock sk, int optname, char __user optval, uns
		ret = 0;
		if (!ip6mr_new_table(net, v))
		ret = -ENOMEM;
		else
		raw6_sk(sk)->ip6mr_table = v;
		rtnl_unlock();
		return ret;