Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c84b3268 authored by Eric Paris's avatar Eric Paris Committed by David S. Miller
Browse files

net: check kern before calling security subsystem 



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: default avatarEric Paris <eparis@redhat.com>
Acked-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3f378b68

net/bluetooth/l2cap.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/ipv4/af_inet.c

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ lookup_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;

net/ipv6/af_inet6.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ lookup_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;