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

Merge branch 'master' of /repos/git/net-next-2.6

Browse Source 
Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:
Patrick McHardy
2010-02-10 14:17:10 +01:00
parent 7678037319 b1109bf085
commit 9ab99d5a43
2023 changed files with 75978 additions and 23833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/bridge/netfilter/ebtables.c
View File

@ -1413,6 +1413,9 @@ static int do_ebt_set_ctl(struct sock *sk,
{
int ret;
if (!capable(CAP_NET_ADMIN))
return -EPERM;
switch(cmd) {
case EBT_SO_SET_ENTRIES:
ret = do_replace(sock_net(sk), user, len);
@ -1432,6 +1435,9 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
struct ebt_replace tmp;
struct ebt_table *t;
if (!capable(CAP_NET_ADMIN))
return -EPERM;
if (copy_from_user(&tmp, user, sizeof(tmp)))
return -EFAULT;