diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-03 07:35:23 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-03 07:35:23 +0200 |
| commit | e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a (patch) | |
| tree | 4e1ca325dde22f1ac21c9da0be509e87e922e604 /net/llc/af_llc.c | |
| parent | [NETNS]: Do not include net/net_namespace.h from seq_file.h (diff) | |
| parent | [VLAN]: Proc entry is not renamed when vlan device name changes. (diff) | |
| download | linux-e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a.tar.xz linux-e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/s2io.c
Diffstat (limited to 'net/llc/af_llc.c')
| -rw-r--r-- | net/llc/af_llc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index f93b57618582..97101dcde4c0 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c @@ -155,6 +155,9 @@ static int llc_ui_create(struct net *net, struct socket *sock, int protocol) struct sock *sk; int rc = -ESOCKTNOSUPPORT; + if (!capable(CAP_NET_RAW)) + return -EPERM; + if (net != &init_net) return -EAFNOSUPPORT; |