---

yaml --- r: 194334 b: refs/heads/master c: 40eaf96 h: refs/heads/master v: v3
git-mirror · Apr 22, 2010 · 1034a60 · 1034a60
1 parent d460da8
commit 1034a60
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa2ea0586d9dbe56a334d835a43b45e8c2104e77
+refs/heads/master: 40eaf96271526a9f71030dd1a199ce46c045752e
diff --git a/trunk/include/linux/filter.h b/trunk/include/linux/filter.h
@@ -123,7 +123,8 @@ struct sock_fprog {	/* Required for SO_ATTACH_FILTER. */
 #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 --git a/trunk/net/core/filter.c b/trunk/net/core/filter.c
@@ -302,6 +302,8 @@ unsigned int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int
 			A = skb->pkt_type;
 			continue;
 		case SKF_AD_IFINDEX:
+			if (!skb->dev)
+				return 0;
 			A = skb->dev->ifindex;
 			continue;
 		case SKF_AD_MARK:
@@ -310,6 +312,11 @@ unsigned int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int
 		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;