Skip to content

Commit

Permalink
[NETFILTER]: xt_pkttype: fix mismatches on locally generated packets
Browse files Browse the repository at this point in the history
Locally generated broadcast and multicast packets have pkttype set to
PACKET_LOOPBACK instead of PACKET_BROADCAST or PACKET_MULTICAST. This
causes the pkttype match to fail to match packets of either type.

The below patch remedies this by using the daddr as a hint as to
broadcast|multicast. While not pretty, this seems like the only way
to solve the problem short of just noting this as a limitation of the
match.

This resolves netfilter bugzilla #484

Signed-off-by: Phil Oester <kernel@linuxace.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Phil Oester authored and David S. Miller committed Jul 25, 2006
1 parent 8cf8fb5 commit 28658c8
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion net/netfilter/xt_pkttype.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#include <linux/skbuff.h>
#include <linux/if_ether.h>
#include <linux/if_packet.h>
#include <linux/in.h>
#include <linux/ip.h>

#include <linux/netfilter/xt_pkttype.h>
#include <linux/netfilter/x_tables.h>
Expand All @@ -28,9 +30,17 @@ static int match(const struct sk_buff *skb,
unsigned int protoff,
int *hotdrop)
{
u_int8_t type;
const struct xt_pkttype_info *info = matchinfo;

return (skb->pkt_type == info->pkttype) ^ info->invert;
if (skb->pkt_type == PACKET_LOOPBACK)
type = (MULTICAST(skb->nh.iph->daddr)
? PACKET_MULTICAST
: PACKET_BROADCAST);
else
type = skb->pkt_type;

return (type == info->pkttype) ^ info->invert;
}

static struct xt_match pkttype_match = {
Expand Down

0 comments on commit 28658c8

Please sign in to comment.