From: claudio <claudio@openbsd.org>
Date: Tue, 2 Feb 2021 17:55:12 +0000 (+0000)
Subject: As done for the AF_INET multicast case, ensure that passed interface
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1d88f30e2953cd9d5feedea5735fd54739e644aa;p=openbsd

As done for the AF_INET multicast case, ensure that passed interface
via index is actually in the right rdomain for the socket.
OK bluhm@ mvs@
---

diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 08fbda8b62d..67972c0d72b 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_output.c,v 1.252 2021/02/02 17:53:02 claudio Exp $	*/
+/*	$OpenBSD: ip6_output.c,v 1.253 2021/02/02 17:55:12 claudio Exp $	*/
 /*	$KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $	*/
 
 /*
@@ -1916,7 +1916,8 @@ ip6_setmoptions(int optname, struct ip6_moptions **im6op, struct mbuf *m,
 				error = ENXIO;	/* XXX EINVAL? */
 				break;
 			}
-			if ((ifp->if_flags & IFF_MULTICAST) == 0) {
+			if (ifp->if_rdomain != rtable_l2(rtableid) ||
+			    (ifp->if_flags & IFF_MULTICAST) == 0) {
 				error = EADDRNOTAVAIL;
 				if_put(ifp);
 				break;
@@ -2023,7 +2024,8 @@ ip6_setmoptions(int optname, struct ip6_moptions **im6op, struct mbuf *m,
 		 * See if we found an interface, and confirm that it
 		 * supports multicast
 		 */
-		if (ifp == NULL || (ifp->if_flags & IFF_MULTICAST) == 0) {
+		if (ifp == NULL || ifp->if_rdomain != rtable_l2(rtableid) ||
+		    (ifp->if_flags & IFF_MULTICAST) == 0) {
 			if_put(ifp);
 			error = EADDRNOTAVAIL;
 			break;