diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2005-12-27 16:57:59 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2005-12-27 16:57:59 -0500 |
commit | 1b93ae64cabe5e28dd5a1f35f96f938ca4f6ae20 (patch) | |
tree | a8c5c7d08e6c658853245ad0b0cf47f0af1ff83d /net/core | |
parent | 6732badee0dad467fcc9dd0168af8677b2b1bc2f (diff) |
[NET]: Validate socket filters against BPF_MAXINSNS in one spot.
Currently the checks are scattered all over and this leads
to inconsistencies and even cases where the check is not made.
Based upon a patch from Kris Katterjohn.
Signed-off-by: David S. Miller <davem@davemloft.net>
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 2841bfce29d6..3a10e0bc90e8 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); |