Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -539,7 +539,7 @@ static int get_filter(void __user *arg, struct sock_filter **p)
|
||||
{
|
||||
struct sock_fprog uprog;
|
||||
struct sock_filter *code = NULL;
|
||||
int len, err;
|
||||
int len;
|
||||
|
||||
if (copy_from_user(&uprog, arg, sizeof(uprog)))
|
||||
return -EFAULT;
|
||||
@@ -554,12 +554,6 @@ static int get_filter(void __user *arg, struct sock_filter **p)
|
||||
if (IS_ERR(code))
|
||||
return PTR_ERR(code);
|
||||
|
||||
err = sk_chk_filter(code, uprog.len);
|
||||
if (err) {
|
||||
kfree(code);
|
||||
return err;
|
||||
}
|
||||
|
||||
*p = code;
|
||||
return uprog.len;
|
||||
}
|
||||
|
Reference in New Issue
Block a user