| Message ID | 20100422133222.GU19334@cel.leo |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Paul LeoNerd Evans <leonerd@leonerd.org.uk> Date: Thu, 22 Apr 2010 14:32:22 +0100 > Add an SKF_AD_HATYPE field to the packet ancilliary data area, giving > access to skb->dev->type, as reported in the sll_hatype field. > > When capturing packets on a PF_PACKET/SOCK_RAW socket bound to all > interfaces, there doesn't appear to be a way for the filter program to > actually find out the underlying hardware type the packet was captured > on. This patch adds such ability. > > This patch also handles the case where skb->dev can be NULL, such as on > netlink sockets. > > Signed-off-by: Paul Evans <leonerd@leonerd.org.uk> Looks good, applied to net-next-2.6, thanks! -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff -ur linux-2.6.33.2.orig/include/linux/filter.h linux-2.6.33.2/include/linux/filter.h --- linux-2.6.33.2.orig/include/linux/filter.h 2010-04-02 00:02:33.000000000 +0100 +++ linux-2.6.33.2/include/linux/filter.h 2010-04-20 22:40:25.000000000 +0100 @@ -123,7 +123,8 @@ #define SKF_AD_NLATTR_NEST 16 #define SKF_AD_MARK 20 #define SKF_AD_QUEUE 24 -#define SKF_AD_MAX 28 +#define SKF_AD_HATYPE 28 +#define SKF_AD_MAX 32 #define SKF_NET_OFF (-0x100000) #define SKF_LL_OFF (-0x200000) diff -ur linux-2.6.33.2.orig/net/core/filter.c linux-2.6.33.2/net/core/filter.c --- linux-2.6.33.2.orig/net/core/filter.c 2010-04-02 00:02:33.000000000 +0100 +++ linux-2.6.33.2/net/core/filter.c 2010-04-22 14:19:24.000000000 +0100 @@ -301,6 +301,8 @@ A = skb->pkt_type; continue; case SKF_AD_IFINDEX: + if (!skb->dev) + return 0; A = skb->dev->ifindex; continue; case SKF_AD_MARK: @@ -309,6 +311,11 @@ case SKF_AD_QUEUE: A = skb->queue_mapping; continue; + case SKF_AD_HATYPE: + if (!skb->dev) + return 0; + A = skb->dev->type; + continue; case SKF_AD_NLATTR: { struct nlattr *nla;
Add an SKF_AD_HATYPE field to the packet ancilliary data area, giving access to skb->dev->type, as reported in the sll_hatype field. When capturing packets on a PF_PACKET/SOCK_RAW socket bound to all interfaces, there doesn't appear to be a way for the filter program to actually find out the underlying hardware type the packet was captured on. This patch adds such ability. This patch also handles the case where skb->dev can be NULL, such as on netlink sockets. Signed-off-by: Paul Evans <leonerd@leonerd.org.uk> ---