---

yaml --- r: 4109 b: refs/heads/master c: 3154e54 h: refs/heads/master i: 4107: ca5f6dd v: v3
git-mirror · Jul 5, 2005 · aef0305 · aef0305
1 parent 5ac99bc
commit aef0305
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b05b2a49e430220876f8faa7e4778dc7497033c
+refs/heads/master: 3154e540e374bbfd62693d95bc8ed51da95efe75
diff --git a/trunk/net/core/filter.c b/trunk/net/core/filter.c
@@ -76,10 +76,6 @@ static inline void *load_pointer(struct sk_buff *skb, int k,
 
 int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int flen)
 {
-	/* len is UNSIGNED. Byte wide insns relies only on implicit
-	   type casts to prevent reading arbitrary memory locations.
-	 */
-	unsigned int len = skb->len-skb->data_len;
 	struct sock_filter *fentry;	/* We walk down these */
 	void *ptr;
 	u32 A = 0;	   		/* Accumulator */
@@ -206,10 +202,10 @@ int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int flen)
 			}
 			return 0;
 		case BPF_LD|BPF_W|BPF_LEN:
-			A = len;
+			A = skb->len;
 			continue;
 		case BPF_LDX|BPF_W|BPF_LEN:
-			X = len;
+			X = skb->len;
 			continue;
 		case BPF_LD|BPF_W|BPF_IND:
 			k = X + fentry->k;