Commit 4bad4dc9 authored by Kris Katterjohn's avatar Kris Katterjohn Committed by David S. Miller
Browse files

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



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

Signed-off-by: default avatarKris Katterjohn <kjak@ispwest.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dbbc0988

include/linux/filter.h

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static inline unsigned int sk_filter_len(struct sk_filter *fp) 
struct sk_buff;

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_chk_filter(struct sock_filter *filter, int flen);

#endif /* __KERNEL__ */

include/net/sock.h

+2 −2
Original line number Diff line number Diff line
@@ -856,7 +856,7 @@ static inline int sk_filter(struct sock *sk, struct sk_buff *skb, int needlock) 
		

		filter = sk->sk_filter;

		if (filter) {

			int pkt_len = sk_run_filter(skb, filter->insns,

			unsigned int pkt_len = sk_run_filter(skb, filter->insns,

							     filter->len);

			if (!pkt_len)

				err = -EPERM;

net/core/filter.c

+3 −3
Original line number Diff line number Diff line
@@ -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.

 */

 

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 */

	void *ptr;
@@ -241,9 +241,9 @@ int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int flen) 
			A = X;

			continue;

		case BPF_RET|BPF_K:

			return ((unsigned int)fentry->k);

			return fentry->k;

		case BPF_RET|BPF_A:

			return ((unsigned int)A);

			return A;

		case BPF_ST:

			mem[fentry->k] = A;

			continue;