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 /drivers/net/ppp_generic.c | |
| parent | c4c48d83e9ffb1c25cccd59d5ea9dda6ded01faf (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/ppp_generic.c')
| -rw-r--r-- | drivers/net/ppp_generic.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index 50430f79f8cf..1c6d328165bb 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c | |||
| @@ -524,9 +524,6 @@ static int get_filter(void __user *arg, struct sock_filter **p) | |||
| 524 | if (copy_from_user(&uprog, arg, sizeof(uprog))) | 524 | if (copy_from_user(&uprog, arg, sizeof(uprog))) |
| 525 | return -EFAULT; | 525 | return -EFAULT; |
| 526 | 526 | ||
| 527 | if (uprog.len > BPF_MAXINSNS) | ||
| 528 | return -EINVAL; | ||
| 529 | |||
| 530 | if (!uprog.len) { | 527 | if (!uprog.len) { |
| 531 | *p = NULL; | 528 | *p = NULL; |
| 532 | return 0; | 529 | return 0; |