svn commit: r199577 - stable/8/sys/netinet6
Bruce M Simpson
bms at FreeBSD.org
Fri Nov 20 11:58:04 UTC 2009
Author: bms
Date: Fri Nov 20 11:58:04 2009
New Revision: 199577
URL: http://svn.freebsd.org/changeset/base/199577
Log:
MFC r199518:
Adapt the fix for IGMPv2 in r199287 for the IPv6 stack.
Only multicast routing is affected by the issue.
Modified:
stable/8/sys/netinet6/raw_ip6.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/arm/ (props changed)
stable/8/sys/boot/ (props changed)
stable/8/sys/bsm/ (props changed)
stable/8/sys/cddl/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/compat/ (props changed)
stable/8/sys/contrib/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/crypto/ (props changed)
stable/8/sys/ddb/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/sys/fs/ (props changed)
stable/8/sys/gdb/ (props changed)
stable/8/sys/geom/ (props changed)
stable/8/sys/gnu/ (props changed)
stable/8/sys/i386/acpica/ (props changed)
stable/8/sys/i386/bios/ (props changed)
stable/8/sys/i386/compile/ (props changed)
stable/8/sys/i386/cpufreq/ (props changed)
stable/8/sys/i386/i386/ (props changed)
stable/8/sys/i386/ibcs2/ (props changed)
stable/8/sys/i386/include/ (props changed)
stable/8/sys/i386/isa/ (props changed)
stable/8/sys/i386/linux/ (props changed)
stable/8/sys/i386/pci/ (props changed)
stable/8/sys/i386/svr4/ (props changed)
stable/8/sys/i386/xbox/ (props changed)
stable/8/sys/i386/xen/ (props changed)
stable/8/sys/ia64/ (props changed)
stable/8/sys/isa/ (props changed)
stable/8/sys/kern/ (props changed)
stable/8/sys/kgssapi/ (props changed)
stable/8/sys/libkern/ (props changed)
stable/8/sys/mips/ (props changed)
stable/8/sys/modules/ (props changed)
stable/8/sys/net80211/ (props changed)
stable/8/sys/netatalk/ (props changed)
stable/8/sys/netgraph/ (props changed)
stable/8/sys/netinet/ (props changed)
stable/8/sys/netipsec/ (props changed)
stable/8/sys/netipx/ (props changed)
stable/8/sys/netnatm/ (props changed)
stable/8/sys/netncp/ (props changed)
stable/8/sys/netsmb/ (props changed)
stable/8/sys/nfs/ (props changed)
stable/8/sys/nfsclient/ (props changed)
stable/8/sys/nfsserver/ (props changed)
stable/8/sys/nlm/ (props changed)
stable/8/sys/opencrypto/ (props changed)
stable/8/sys/pc98/ (props changed)
stable/8/sys/pci/ (props changed)
stable/8/sys/powerpc/ (props changed)
stable/8/sys/rpc/ (props changed)
stable/8/sys/security/ (props changed)
stable/8/sys/sparc64/ (props changed)
stable/8/sys/sun4v/ (props changed)
stable/8/sys/sys/ (props changed)
stable/8/sys/tools/ (props changed)
stable/8/sys/ufs/ (props changed)
stable/8/sys/vm/ (props changed)
stable/8/sys/xdr/ (props changed)
stable/8/sys/xen/ (props changed)
Modified: stable/8/sys/netinet6/raw_ip6.c
==============================================================================
--- stable/8/sys/netinet6/raw_ip6.c Fri Nov 20 09:00:38 2009 (r199576)
+++ stable/8/sys/netinet6/raw_ip6.c Fri Nov 20 11:58:04 2009 (r199577)
@@ -213,17 +213,39 @@ rip6_input(struct mbuf **mp, int *offp,
*/
if (in6p->in6p_moptions &&
IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) {
- struct sockaddr_in6 mcaddr;
+ /*
+ * If the incoming datagram is for MLD, allow it
+ * through unconditionally to the raw socket.
+ *
+ * Use the M_RTALERT_MLD flag to check for MLD
+ * traffic without having to inspect the mbuf chain
+ * more deeply, as all MLDv1/v2 host messages MUST
+ * contain the Router Alert option.
+ *
+ * In the case of MLDv1, we may not have explicitly
+ * joined the group, and may have set IFF_ALLMULTI
+ * on the interface. im6o_mc_filter() may discard
+ * control traffic we actually need to see.
+ *
+ * Userland multicast routing daemons should continue
+ * filter the control traffic appropriately.
+ */
int blocked;
- bzero(&mcaddr, sizeof(struct sockaddr_in6));
- mcaddr.sin6_len = sizeof(struct sockaddr_in6);
- mcaddr.sin6_family = AF_INET6;
- mcaddr.sin6_addr = ip6->ip6_dst;
-
- blocked = im6o_mc_filter(in6p->in6p_moptions, ifp,
- (struct sockaddr *)&mcaddr,
- (struct sockaddr *)&fromsa);
+ blocked = MCAST_PASS;
+ if ((m->m_flags & M_RTALERT_MLD) == 0) {
+ struct sockaddr_in6 mcaddr;
+
+ bzero(&mcaddr, sizeof(struct sockaddr_in6));
+ mcaddr.sin6_len = sizeof(struct sockaddr_in6);
+ mcaddr.sin6_family = AF_INET6;
+ mcaddr.sin6_addr = ip6->ip6_dst;
+
+ blocked = im6o_mc_filter(in6p->in6p_moptions,
+ ifp,
+ (struct sockaddr *)&mcaddr,
+ (struct sockaddr *)&fromsa);
+ }
if (blocked != MCAST_PASS) {
IP6STAT_INC(ip6s_notmember);
continue;
More information about the svn-src-stable
mailing list