lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master'

Browse Source
This commit is contained in:
Jeff Garzik
2006-01-03 10:49:18 -05:00
parent c4c48d83e9 88026842b0
commit ac67c62473
147 changed files with 1194 additions and 894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/core/filter.c
View File

@@ -293,7 +293,7 @@ int sk_chk_filter(struct sock_filter *filter, int flen)
struct sock_filter *ftest;
int pc;
if (((unsigned int)flen >= (~0U / sizeof(struct sock_filter))) || flen == 0)
if (flen == 0 || flen > BPF_MAXINSNS)
return -EINVAL;
/* check the filter code now */
@@ -360,7 +360,7 @@ int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk)
int err;
/* Make sure new filter is there and in the right amounts. */
if (fprog->filter == NULL || fprog->len > BPF_MAXINSNS)
if (fprog->filter == NULL)
return -EINVAL;
fp = sock_kmalloc(sk, fsize+sizeof(*fp), GFP_KERNEL);