diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:49:18 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:49:18 -0500 |
| commit | ac67c6247361b3b8644b34e5301a46d5069c1373 (patch) | |
| tree | dd83147e304181e889eefa39e5056451031f4b5d /net/core | |
| parent | c4c48d83e9ffb1c25cccd59d5ea9dda6ded01faf (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
Merge branch 'master'
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/filter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index 2841bfce29d..3a10e0bc90e 100644 --- a/net/core/filter.c +++ b/net/core/filter.c | |||
| @@ -293,7 +293,7 @@ int sk_chk_filter(struct sock_filter *filter, int flen) | |||
| 293 | struct sock_filter *ftest; | 293 | struct sock_filter *ftest; |
| 294 | int pc; | 294 | int pc; |
| 295 | 295 | ||
| 296 | if (((unsigned int)flen >= (~0U / sizeof(struct sock_filter))) || flen == 0) | 296 | if (flen == 0 || flen > BPF_MAXINSNS) |
| 297 | return -EINVAL; | 297 | return -EINVAL; |
| 298 | 298 | ||
| 299 | /* check the filter code now */ | 299 | /* check the filter code now */ |
| @@ -360,7 +360,7 @@ int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk) | |||
| 360 | int err; | 360 | int err; |
| 361 | 361 | ||
| 362 | /* Make sure new filter is there and in the right amounts. */ | 362 | /* Make sure new filter is there and in the right amounts. */ |
| 363 | if (fprog->filter == NULL || fprog->len > BPF_MAXINSNS) | 363 | if (fprog->filter == NULL) |
| 364 | return -EINVAL; | 364 | return -EINVAL; |
| 365 | 365 | ||
| 366 | fp = sock_kmalloc(sk, fsize+sizeof(*fp), GFP_KERNEL); | 366 | fp = sock_kmalloc(sk, fsize+sizeof(*fp), GFP_KERNEL); |