From: Yan Zheng <yanzheng@21cn.com>
To: netdev@vger.kernel.org, David Stevens <dlstevens@us.ibm.com>
Cc: linux-kernel@vger.kernel.org, davem@davemloft.net
Subject: [PATCH][MCAST]Check packet size when process Multicast Address and Source Specific Query
Date: Wed, 09 Nov 2005 20:35:26 +0800 [thread overview]
Message-ID: <4371ED0E.3030501@21cn.com> (raw)
The patch changes the old one to equivalent code in IGMPv3 as David Stevens's suggestion
http://lkml.org/lkml/2005/10/31/221
Regards
Signed-off-by: Yan Zheng<yanzheng@21cn.com>
Index:net/ipv6/mcast.c
==============================================================
--- linux-2.6.14/net/ipv6/mcast.c 2005-11-09 16:00:48.000000000 +0800
+++ linux/net/ipv6/mcast.c 2005-11-09 16:20:03.000000000 +0800
@@ -1149,6 +1149,14 @@ int igmp6_event_query(struct sk_buff *sk
return -EINVAL;
}
mlh2 = (struct mld2_query *) skb->h.raw;
+ if (mlh2->nsrcs != 0) {
+ if (!pskb_may_pull(skb, srcs_offset +
+ mlh2->nsrcs * sizeof(struct in6_addr))) {
+ in6_dev_put(idev);
+ return -EINVAL;
+ }
+ mlh2 = (struct mld2_query *) skb->h.raw;
+ }
max_delay = (MLDV2_MRC(ntohs(mlh2->mrc))*HZ)/1000;
if (!max_delay)
max_delay = 1;
@@ -1165,15 +1173,7 @@ int igmp6_event_query(struct sk_buff *sk
return 0;
}
/* mark sources to include, if group & source-specific */
- if (mlh2->nsrcs != 0) {
- if (!pskb_may_pull(skb, srcs_offset +
- mlh2->nsrcs * sizeof(struct in6_addr))) {
- in6_dev_put(idev);
- return -EINVAL;
- }
- mlh2 = (struct mld2_query *) skb->h.raw;
- mark = 1;
- }
+ mark = mlh2->nsrcs != 0;
} else {
in6_dev_put(idev);
return -EINVAL;
reply other threads:[~2005-11-09 12:34 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4371ED0E.3030501@21cn.com \
--to=yanzheng@21cn.com \
--cc=davem@davemloft.net \
--cc=dlstevens@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.