aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/filter.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/core/filter.c')
-rw-r--r--net/core/filter.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/core/filter.c b/net/core/filter.c
index 0df843b667f..8123a31d919 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -53,7 +53,7 @@ static void *__load_pointer(struct sk_buff *skb, int k)
53} 53}
54 54
55static inline void *load_pointer(struct sk_buff *skb, int k, 55static inline void *load_pointer(struct sk_buff *skb, int k,
56 unsigned int size, void *buffer) 56 unsigned int size, void *buffer)
57{ 57{
58 if (k >= 0) 58 if (k >= 0)
59 return skb_header_pointer(skb, k, size, buffer); 59 return skb_header_pointer(skb, k, size, buffer);
@@ -91,7 +91,7 @@ unsigned int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int
91 */ 91 */
92 for (pc = 0; pc < flen; pc++) { 92 for (pc = 0; pc < flen; pc++) {
93 fentry = &filter[pc]; 93 fentry = &filter[pc];
94 94
95 switch (fentry->code) { 95 switch (fentry->code) {
96 case BPF_ALU|BPF_ADD|BPF_X: 96 case BPF_ALU|BPF_ADD|BPF_X:
97 A += X; 97 A += X;
@@ -399,7 +399,7 @@ int sk_chk_filter(struct sock_filter *filter, int flen)
399 */ 399 */
400int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk) 400int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk)
401{ 401{
402 struct sk_filter *fp; 402 struct sk_filter *fp;
403 unsigned int fsize = sizeof(struct sock_filter) * fprog->len; 403 unsigned int fsize = sizeof(struct sock_filter) * fprog->len;
404 int err; 404 int err;
405 405
@@ -411,7 +411,7 @@ int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk)
411 if (!fp) 411 if (!fp)
412 return -ENOMEM; 412 return -ENOMEM;
413 if (copy_from_user(fp->insns, fprog->filter, fsize)) { 413 if (copy_from_user(fp->insns, fprog->filter, fsize)) {
414 sock_kfree_s(sk, fp, fsize+sizeof(*fp)); 414 sock_kfree_s(sk, fp, fsize+sizeof(*fp));
415 return -EFAULT; 415 return -EFAULT;
416 } 416 }
417 417