Skip to content

Commit

Permalink
net: check kern before calling security subsystem
Browse files Browse the repository at this point in the history
Before calling capable(CAP_NET_RAW) check if this operations is on behalf
of the kernel or on behalf of userspace.  Do not do the security check if
it is on behalf of the kernel.

Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Eric Paris authored and David S. Miller committed Nov 6, 2009
1 parent 3f378b6 commit c84b326
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion net/bluetooth/l2cap.c
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ static int l2cap_sock_create(struct net *net, struct socket *sock, int protocol,
sock->type != SOCK_DGRAM && sock->type != SOCK_RAW)
return -ESOCKTNOSUPPORT;

if (sock->type == SOCK_RAW && !capable(CAP_NET_RAW))
if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW))
return -EPERM;

sock->ops = &l2cap_sock_ops;
Expand Down
2 changes: 1 addition & 1 deletion net/ipv4/af_inet.c
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ static int inet_create(struct net *net, struct socket *sock, int protocol,
}

err = -EPERM;
if (sock->type == SOCK_RAW && !capable(CAP_NET_RAW))
if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW))
goto out_rcu_unlock;

err = -EAFNOSUPPORT;
Expand Down
2 changes: 1 addition & 1 deletion net/ipv6/af_inet6.c
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol,
}

err = -EPERM;
if (sock->type == SOCK_RAW && !capable(CAP_NET_RAW))
if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW))
goto out_rcu_unlock;

sock->ops = answer->ops;
Expand Down

0 comments on commit c84b326

Please sign in to comment.