summaryrefslogtreecommitdiffstats
path: root/net/ipv4/igmp.c
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2014-10-05 17:27:50 +0200
committerDavid S. Miller <davem@davemloft.net>2014-10-06 23:14:54 +0200
commitb47bd8d2795412143a23d2961033c126ce6914d9 (patch)
treeee5ac84b2ee7065f320089f67c11198423eaf57e /net/ipv4/igmp.c
parentbonding: Simplify the xmit function for modes that use xmit_hash (diff)
downloadlinux-b47bd8d2795412143a23d2961033c126ce6914d9.tar.xz
linux-b47bd8d2795412143a23d2961033c126ce6914d9.zip
ipv4: igmp: fix v3 general query drop monitor false positive
In case we find a general query with non-zero number of sources, we are dropping the skb as it's malformed. RFC3376, section 4.1.8. Number of Sources (N): This number is zero in a General Query or a Group-Specific Query, and non-zero in a Group-and-Source-Specific Query. Therefore, reflect that by using kfree_skb() instead of consume_skb(). Fixes: d679c5324d9a ("igmp: avoid drop_monitor false positives") Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r--net/ipv4/igmp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 4146153d875d..fb70e3ecc3e4 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -931,7 +931,7 @@ static bool igmp_heard_query(struct in_device *in_dev, struct sk_buff *skb,
in_dev->mr_qrv = ih3->qrv;
if (!group) { /* general query */
if (ih3->nsrcs)
- return false; /* no sources allowed */
+ return true; /* no sources allowed */
igmp_gq_start_timer(in_dev);
return false;
}