ANDROID: net: Replace AID_NET_RAW checks with capable(CAP_NET_RAW).
Signed-off-by: Chia-chi Yeh <chiachi@android.com>
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 92ba1dc..c836bfe 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -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 @@
}
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 @@
}
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;