diff options
| author |   Paolo Abeni <pabeni@redhat.com> | 2016-03-22 09:19:38 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-03-22 15:53:50 -0400 |
| commit | ad0ea1989cc4d5905941d0a9e62c63ad6d859cef (patch) | |
| tree | 3da2a55a9729b52a5e667bd2b4e0aa99c5d78d2f /net/ipv4/udp.c | |
| parent | Merge branch 'hns-fixes' (diff) | |
| download | linux-dev-ad0ea1989cc4d5905941d0a9e62c63ad6d859cef.tar.xz linux-dev-ad0ea1989cc4d5905941d0a9e62c63ad6d859cef.zip | |
ipv4: fix broadcast packets reception
Currently, ingress ipv4 broadcast datagrams are dropped since,
in udp_v4_early_demux(), ip_check_mc_rcu() is invoked even on
bcast packets.
This patch addresses the issue, invoking ip_check_mc_rcu()
only for mcast packets.
Fixes: 6e5403093261 ("ipv4/udp: Verify multicast group is ours in upd_v4_early_demux()")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/udp.c')
| -rw-r--r-- | net/ipv4/udp.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 836abe58a9c5..08eed5e16df0 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -2070,10 +2070,14 @@ void udp_v4_early_demux(struct sk_buff *skb) if (!in_dev) return; - ours = ip_check_mc_rcu(in_dev, iph->daddr, iph->saddr, - iph->protocol); - if (!ours) - return; + /* we are supposed to accept bcast packets */ + if (skb->pkt_type == PACKET_MULTICAST) { + ours = ip_check_mc_rcu(in_dev, iph->daddr, iph->saddr, + iph->protocol); + if (!ours) + return; + } + sk = __udp4_lib_mcast_demux_lookup(net, uh->dest, iph->daddr, uh->source, iph->saddr, dif); } else if (skb->pkt_type == PACKET_HOST) { |