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 843544831230901bcb6720cc71bc9e705c068b6f..cefdfddc898a831b3b5255b636fabcba5d8e4c42 100644 (file)
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -119,6 +119,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;

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 9f06eb916682dd518b1199381557c84cc711a531..2f421a4beca750781c5be967de6a41dd3013ca27 100644 (file)
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -65,6 +65,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
 
 MODULE_AUTHOR("Cast of dozens");
@@ -100,29 +110,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(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
-
 static int inet6_create(struct net *net, struct socket *sock, int protocol,
                        int kern)
 {
@@ -190,7 +177,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;
 
        sock->ops = answer->ops;