From ca5f6dd22eb36d1510be698059ef4b66737827a1 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Tue, 5 Jul 2005 14:08:57 -0700 Subject: [PATCH] --- yaml --- r: 4107 b: refs/heads/master c: 6935d46c2da64aa032a557374c95336e265cd7ef h: refs/heads/master i: 4105: 7d96c5c28be9e1c2139a6d9c454f403016956548 4103: a6616076620d7772ffa8b591edaeb4e37f754a53 v: v3 --- [refs] | 2 +- trunk/net/core/filter.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 31eac5cffcbf..9d543c3cd138 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55820ee2f8c767a2833b21bd365e5753f50bd8ce +refs/heads/master: 6935d46c2da64aa032a557374c95336e265cd7ef diff --git a/trunk/net/core/filter.c b/trunk/net/core/filter.c index f3b88205ace2..e1267b465def 100644 --- a/trunk/net/core/filter.c +++ b/trunk/net/core/filter.c @@ -168,10 +168,6 @@ int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int flen) case BPF_LD|BPF_W|BPF_ABS: k = fentry->k; load_w: - if (k >= 0 && (unsigned int)(k+sizeof(u32)) <= len) { - A = ntohl(*(u32*)&data[k]); - continue; - } if (k < 0) { u8 *ptr; @@ -194,10 +190,6 @@ int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int flen) case BPF_LD|BPF_H|BPF_ABS: k = fentry->k; load_h: - if (k >= 0 && (unsigned int)(k + sizeof(u16)) <= len) { - A = ntohs(*(u16*)&data[k]); - continue; - } if (k < 0) { u8 *ptr; @@ -220,10 +212,6 @@ int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int flen) case BPF_LD|BPF_B|BPF_ABS: k = fentry->k; load_b: - if (k >= 0 && (unsigned int)k < len) { - A = data[k]; - continue; - } if (k < 0) { u8 *ptr;