Skip to contentSkip to conversation

ipv6: Use ipv6_is_mld() in ip6_mc_input().

PATCH In review YOSHIFUJI Hideaki 2 participants 3 messages Jan 13, 2013

Subsystems (3)
Networking Network drivers IPv4/IPv6
lore
Share & tools
lore

YOSHIFUJI Hideaki

author
#0 lore raw

PATCH 1/1 ipv6: Use ipv6_is_mld() in ip6_mc_input().

Signed-off-by YOSHIFUJI Hideaki <[email protected]>
---
 include/net/addrconf.h |    2 +-
 net/ipv6/ip6_input.c   |   21 +++------------------
 net/ipv6/mcast.c       |    4 ++--
 3 files changed, 6 insertions(+), 21 deletions(-)
include/net/addrconf.h +1 -1
index df4ef94..59f14ab 100644
@@ -150,7 +150,7 @@ extern void addrconf_dad_failure(struct inet6_ifaddr *ifp);
 extern bool ipv6_chk_mcast_addr(struct net_device *dev,
 				const struct in6_addr *group,
 				const struct in6_addr *src_addr);
-extern bool ipv6_is_mld(struct sk_buff *skb, int nexthdr);
+extern bool ipv6_is_mld(struct sk_buff *skb, int nexthdr, int offset);
 
 extern void addrconf_prefix_rcv(struct net_device *dev,
 				u8 *opt, int len, bool sllao);
net/ipv6/ip6_input.c +3 -18
index a52d864..6de509e 100644
@@ -212,7 +212,7 @@ resubmit:
 			if (ipv6_addr_is_multicast(&hdr->daddr) &&
 			    !ipv6_chk_mcast_addr(skb->dev, &hdr->daddr,
 			    &hdr->saddr) &&
-			    !ipv6_is_mld(skb, nexthdr))
+			    !ipv6_is_mld(skb, nexthdr, 0))
 				goto discard;
 		}
 		if (!(ipprot->flags & INET6_PROTO_NOPOLICY) &&

@@ -283,7 +283,6 @@ int ip6_mc_input(struct sk_buff *skb)
 		if (unlikely(opt->ra)) {
 			/* Check if this is a mld message */
 			u8 *ptr = skb_network_header(skb) + opt->ra;
-			struct icmp6hdr *icmp6;
 			u8 nexthdr = hdr->nexthdr;
 			__be16 frag_off;
 			int offset;

@@ -303,24 +302,10 @@ int ip6_mc_input(struct sk_buff *skb)
 				if (offset < 0)
 					goto out;
 
-				if (nexthdr != IPPROTO_ICMPV6)
+				if (!ipv6_is_mld(skb, offset, nexthdr))
 					goto out;
 
-				if (!pskb_may_pull(skb, (skb_network_header(skb) +
-						   offset + 1 - skb->data)))
-					goto out;
-
-				icmp6 = (struct icmp6hdr *)(skb_network_header(skb) + offset);
-
-				switch (icmp6->icmp6_type) {
-				case ICMPV6_MGM_QUERY:
-				case ICMPV6_MGM_REPORT:
-				case ICMPV6_MGM_REDUCTION:
-				case ICMPV6_MLD2_REPORT:
-					deliver = true;
-					break;
-				}
-				goto out;
+				deliver = true;
 			}
 			/* unknown RA - process it normally */
 		}
net/ipv6/mcast.c +2 -2
index 28dfa5f..b529c27 100644
@@ -937,14 +937,14 @@ int ipv6_dev_mc_dec(struct net_device *dev, const struct in6_addr *addr)
 /*
  * identify MLD packets for MLD filter exceptions
  */
-bool ipv6_is_mld(struct sk_buff *skb, int nexthdr)
+bool ipv6_is_mld(struct sk_buff *skb, int nexthdr, int offset)
 {
 	struct icmp6hdr *pic;
 
 	if (nexthdr != IPPROTO_ICMPV6)
 		return false;
 
-	if (!pskb_may_pull(skb, sizeof(struct icmp6hdr)))
+	if (!pskb_may_pull(skb, offset + sizeof(struct icmp6hdr)))
 		return false;
 
 	pic = icmp6_hdr(skb);
Signature · 1 line
1.7.9.5
author
#1 lore raw
Quoted 80 lines · YOSHIFUJI Hideaki
Signed-off-by YOSHIFUJI Hideaki <[email protected]>
---
 include/net/addrconf.h |    2 +-
 net/ipv6/ip6_input.c   |   21 +++------------------
 net/ipv6/mcast.c       |    4 ++--
 3 files changed, 6 insertions(+), 21 deletions(-)
include/net/addrconf.h +1 -1
index df4ef94..59f14ab 100644
@@ -150,7 +150,7 @@ extern void addrconf_dad_failure(struct inet6_ifaddr *ifp);
 extern bool ipv6_chk_mcast_addr(struct net_device *dev,
 				const struct in6_addr *group,
 				const struct in6_addr *src_addr);
-extern bool ipv6_is_mld(struct sk_buff *skb, int nexthdr);
+extern bool ipv6_is_mld(struct sk_buff *skb, int nexthdr, int offset);
 
 extern void addrconf_prefix_rcv(struct net_device *dev,
 				u8 *opt, int len, bool sllao);
net/ipv6/ip6_input.c +3 -18
index a52d864..6de509e 100644
@@ -212,7 +212,7 @@ resubmit:
 			if (ipv6_addr_is_multicast(&hdr->daddr) &&
 			    !ipv6_chk_mcast_addr(skb->dev, &hdr->daddr,
 			    &hdr->saddr) &&
-			    !ipv6_is_mld(skb, nexthdr))
+			    !ipv6_is_mld(skb, nexthdr, 0))
 				goto discard;
 		}
 		if (!(ipprot->flags & INET6_PROTO_NOPOLICY) &&

@@ -283,7 +283,6 @@ int ip6_mc_input(struct sk_buff *skb)
 		if (unlikely(opt->ra)) {
 			/* Check if this is a mld message */
 			u8 *ptr = skb_network_header(skb) + opt->ra;
-			struct icmp6hdr *icmp6;
 			u8 nexthdr = hdr->nexthdr;
 			__be16 frag_off;
 			int offset;

@@ -303,24 +302,10 @@ int ip6_mc_input(struct sk_buff *skb)
 				if (offset < 0)
 					goto out;
 
-				if (nexthdr != IPPROTO_ICMPV6)
+				if (!ipv6_is_mld(skb, offset, nexthdr))
 					goto out;
 
-				if (!pskb_may_pull(skb, (skb_network_header(skb) +
-						   offset + 1 - skb->data)))
-					goto out;
-
-				icmp6 = (struct icmp6hdr *)(skb_network_header(skb) + offset);
-
-				switch (icmp6->icmp6_type) {
-				case ICMPV6_MGM_QUERY:
-				case ICMPV6_MGM_REPORT:
-				case ICMPV6_MGM_REDUCTION:
-				case ICMPV6_MLD2_REPORT:
-					deliver = true;
-					break;
-				}
-				goto out;
+				deliver = true;
 			}
 			/* unknown RA - process it normally */
 		}
net/ipv6/mcast.c +1 -1
index 28dfa5f..b529c27 100644
@@ -937,14 +937,14 @@ int ipv6_dev_mc_dec(struct net_device *dev, const struct in6_addr *addr)
 /*
  * identify MLD packets for MLD filter exceptions
  */
-bool ipv6_is_mld(struct sk_buff *skb, int nexthdr)
+bool ipv6_is_mld(struct sk_buff *skb, int nexthdr, int offset)
 {

net/ipv6/mcast.c int ipv6_dev_mc_dec(struct net_device *dev, const struct in6_addr *addr) · line 950

Quoted 10 lines
net/ipv6/mcast.c +1 -1
 	struct icmp6hdr *pic;
 
 	if (nexthdr != IPPROTO_ICMPV6)
 		return false;
 
-	if (!pskb_may_pull(skb, sizeof(struct icmp6hdr)))
+	if (!pskb_may_pull(skb, offset + sizeof(struct icmp6hdr)))
 		return false;
 
 	pic = icmp6_hdr(skb);

Sorry I found some bugs, I'll repost.

--yoshfuji

maintainer
#2 lore raw

From: YOSHIFUJI Hideaki <[email protected]>
Date: Sun, 13 Jan 2013 17:43:44 +0900

Quoted 1 line

Sorry I found some bugs, I'll repost.

You should repost the whole series, and properly number your patches this time.

Thanks.