malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[NET]: Change sk_run_filter()'s return type in net/core/filter.c

Browse Source 
It should return an unsigned value, and fix sk_filter() as well.

Signed-off-by: Kris Katterjohn <kjak@ispwest.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Kris Katterjohn 2006-01-06 13:08:20 -08:00 committed by David S. Miller
parent dbbc098828
commit 4bad4dc919
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/filter.h
View File

@ -143,7 +143,7 @@ static inline unsigned int sk_filter_len(struct sk_filter *fp)
struct sk_buff; struct sk_buff;
struct sock; struct sock;
extern int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int flen); extern unsigned int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int flen);
extern int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk); extern int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk);
extern int sk_chk_filter(struct sock_filter *filter, int flen); extern int sk_chk_filter(struct sock_filter *filter, int flen);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

4
include/net/sock.h
View File

@ -856,8 +856,8 @@ static inline int sk_filter(struct sock *sk, struct sk_buff *skb, int needlock)
filter = sk->sk_filter; filter = sk->sk_filter;
if (filter) { if (filter) {
int pkt_len = sk_run_filter(skb, filter->insns, unsigned int pkt_len = sk_run_filter(skb, filter->insns,
filter->len); filter->len);
if (!pkt_len) if (!pkt_len)
err = -EPERM; err = -EPERM;
else else

6
net/core/filter.c
View File

@ -75,7 +75,7 @@ static inline void *load_pointer(struct sk_buff *skb, int k,
* len is the number of filter blocks in the array. * len is the number of filter blocks in the array.
*/ */
int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int flen) unsigned int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int flen)
{ {
struct sock_filter *fentry; /* We walk down these */ struct sock_filter *fentry; /* We walk down these */
void *ptr; void *ptr;
@ -241,9 +241,9 @@ load_b:
A = X; A = X;
continue; continue;
case BPF_RET|BPF_K: case BPF_RET|BPF_K:
return ((unsigned int)fentry->k); return fentry->k;
case BPF_RET|BPF_A: case BPF_RET|BPF_A:
return ((unsigned int)A); return A;
case BPF_ST: case BPF_ST:
mem[fentry->k] = A; mem[fentry->k] = A;
continue; continue;