shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: net: Replace AID_NET_RAW checks with capable(CAP_NET_RAW).

Browse Source 
Signed-off-by: Chia-chi Yeh <chiachi@android.com>
This commit is contained in:
Chia-chi Yeh
2009-06-30 11:23:04 +08:00
committed by Dmitry Shmidt
parent 15caf71a3f
commit c003a30a16
2 changed files with 22 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
net/ipv4/af_inet.c
View File

@@ -123,6 +123,16 @@
#ifdef CONFIG_ANDROID_PARANOID_NETWORK
#include <linux/android_aid.h>
static inline int current_has_network(void)
{
return in_egroup_p(AID_INET) || capable(CAP_NET_RAW);
}
#else
static inline int current_has_network(void)
{
return 1;
}
#endif
/* The inetsw table contains everything that inet_create needs to
@@ -240,29 +250,6 @@ out:
}
EXPORT_SYMBOL(inet_listen);
#ifdef CONFIG_ANDROID_PARANOID_NETWORK
static inline int current_has_network(void)
{
return (!current_euid() || in_egroup_p(AID_INET) ||
in_egroup_p(AID_NET_RAW));
}
static inline int current_has_cap(struct net *net, int cap)
{
if (cap == CAP_NET_RAW && in_egroup_p(AID_NET_RAW))
return 1;
return ns_capable(net->user_ns, cap);
}
# else
static inline int current_has_network(void)
{
return 1;
}
static inline int current_has_cap(struct net *net, int cap)
{
return ns_capable(net->user_ns, cap);
}
#endif
/*
* Create an inet socket.
*/
@@ -332,8 +319,7 @@ lookup_protocol:
}
err = -EPERM;
if (sock->type == SOCK_RAW && !kern &&
!current_has_cap(net, CAP_NET_RAW))
if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW))
goto out_rcu_unlock;
sock->ops = answer->ops;

36
net/ipv6/af_inet6.c
View File

@@ -67,6 +67,16 @@
#ifdef CONFIG_ANDROID_PARANOID_NETWORK
#include <linux/android_aid.h>
static inline int current_has_network(void)
{
return in_egroup_p(AID_INET) || capable(CAP_NET_RAW);
}
#else
static inline int current_has_network(void)
{
return 1;
}
#endif
#include "ip6_offload.h"
@@ -110,29 +120,6 @@ static __inline__ struct ipv6_pinfo *inet6_sk_generic(struct sock *sk)
return (struct ipv6_pinfo *)(((u8 *)sk) + offset);
}
#ifdef CONFIG_ANDROID_PARANOID_NETWORK
static inline int current_has_network(void)
{
return (!current_euid() || in_egroup_p(AID_INET) ||
in_egroup_p(AID_NET_RAW));
}
static inline int current_has_cap(struct net *net, int cap)
{
if (cap == CAP_NET_RAW && in_egroup_p(AID_NET_RAW))
return 1;
return ns_capable(net->user_ns, cap);
}
# else
static inline int current_has_network(void)
{
return 1;
}
static inline int current_has_cap(struct net *net, int cap)
{
return ns_capable(net->user_ns, cap);
}
#endif
static int inet6_create(struct net *net, struct socket *sock, int protocol,
int kern)
{
@@ -197,8 +184,7 @@ lookup_protocol:
}
err = -EPERM;
if (sock->type == SOCK_RAW && !kern &&
!current_has_cap(net, CAP_NET_RAW))
if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW))
goto out_rcu_unlock;
sock->ops = answer->ops;