ANDROID: net: paranoid: 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 d34250051102f5107a971f9eb215b94d5de16148..eeee2219310d2b86c666b94962fcbc62f420fe1c 100644 (file)
--- 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 @@ 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;

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index ecf48100f765457eaa3e8d181d0445e204e9ba3f..b3c91857646e0d2fdb763298b8f5947f25aadf36 100644 (file)
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -68,6 +68,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"
@@ -111,29 +121,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)
 {
@@ -198,8 +185,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;