diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2009-06-30 11:23:04 +0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-04-09 13:57:47 -0700 |
| commit | c543f112f11bd08d5efdf8815ff419bd20a7a392 (patch) | |
| tree | 141ab0657cbec45454b435988db0e7d8b4d5d29b /net/ipv4 | |
| parent | 0432013eb1fbddf51f43d3dfb7553db011c81707 (diff) | |
net: Replace AID_NET_RAW checks with capable(CAP_NET_RAW).
Signed-off-by: Chia-chi Yeh <chiachi@android.com>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/af_inet.c | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 73a38459f63..0b711659ac7 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -121,6 +121,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 @@ -262,28 +272,6 @@ static inline int inet_netns_ok(struct net *net, int protocol) return ipprot->netns_ok; } -#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(int cap) -{ - if (cap == CAP_NET_RAW && in_egroup_p(AID_NET_RAW)) - return 1; - return capable(cap); -} -# else -static inline int current_has_network(void) -{ - return 1; -} -static inline int current_has_cap(int cap) -{ - return capable(cap); -} -#endif /* * Create an inet socket. @@ -356,7 +344,7 @@ lookup_protocol: } err = -EPERM; - if (sock->type == SOCK_RAW && !kern && !current_has_cap(CAP_NET_RAW)) + if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW)) goto out_rcu_unlock; err = -EAFNOSUPPORT; |