shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-04-13 00:50:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

Paranoid network.

Browse Source 
With CONFIG_ANDROID_PARANOID_NETWORK, require specific uids/gids to instantiate
network sockets.

Signed-off-by: Robert Love <rlove@google.com>

paranoid networking: Use in_egroup_p() to check group membership

The previous group_search() caused trouble for partners with module builds.
in_egroup_p() is also cleaner.

Signed-off-by: Nick Pelly <npelly@google.com>

Fix 2.6.29 build.

Signed-off-by: Arve Hjønnevåg <arve@android.com>

net: Fix compilation of the IPv6 module

Fix compilation of the IPv6 module -- current->euid does not exist anymore,
current_euid() is what needs to be used.

Signed-off-by: Steinar H. Gunderson <sesse@google.com>
This commit is contained in:
Robert Love
2008-10-15 15:35:44 -04:00
committed by Arve Hjønnevåg
parent 456b818a9e
commit fd64bbf28e
4 changed files with 105 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/Kconfig
View File

@@ -81,6 +81,12 @@ source "net/netlabel/Kconfig"
endif # if INET
config ANDROID_PARANOID_NETWORK
bool "Only allow certain groups to create sockets"
default y
help
none
config NETWORK_SECMARK
bool "Security Marking"
help

38
net/bluetooth/af_bluetooth.c
View File

@@ -30,6 +30,15 @@
#include <net/bluetooth/bluetooth.h>
#include <linux/proc_fs.h>
#ifdef CONFIG_ANDROID_PARANOID_NETWORK
#include <linux/android_aid.h>
#endif
#ifndef CONFIG_BT_SOCK_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
#define VERSION "2.16"
/* Bluetooth sockets */
@@ -103,11 +112,40 @@ void bt_sock_unregister(int proto)
}
EXPORT_SYMBOL(bt_sock_unregister);
#ifdef CONFIG_ANDROID_PARANOID_NETWORK
static inline int current_has_bt_admin(void)
{
return (!current_euid() || in_egroup_p(AID_NET_BT_ADMIN));
}
static inline int current_has_bt(void)
{
return (current_has_bt_admin() || in_egroup_p(AID_NET_BT));
}
# else
static inline int current_has_bt_admin(void)
{
return 1;
}
static inline int current_has_bt(void)
{
return 1;
}
#endif
static int bt_sock_create(struct net *net, struct socket *sock, int proto,
int kern)
{
int err;
if (proto == BTPROTO_RFCOMM || proto == BTPROTO_SCO ||
proto == BTPROTO_L2CAP) {
if (!current_has_bt())
return -EPERM;
} else if (!current_has_bt_admin())
return -EPERM;
if (net != &init_net)
return -EAFNOSUPPORT;

31
net/ipv4/af_inet.c
View File

@@ -119,6 +119,9 @@
#include <linux/mroute.h>
#endif
#ifdef CONFIG_ANDROID_PARANOID_NETWORK
#include <linux/android_aid.h>
#endif
/* The inetsw table contains everything that inet_create needs to
* build a new socket.
@@ -270,6 +273,29 @@ void build_ehash_secret(void)
}
EXPORT_SYMBOL(build_ehash_secret);
#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.
*/
@@ -286,6 +312,9 @@ static int inet_create(struct net *net, struct socket *sock, int protocol,
int try_loading_module = 0;
int err;
if (!current_has_network())
return -EACCES;
if (unlikely(!inet_ehash_secret))
if (sock->type != SOCK_RAW && sock->type != SOCK_DGRAM)
build_ehash_secret();
@@ -339,7 +368,7 @@ lookup_protocol:
err = -EPERM;
if (sock->type == SOCK_RAW && !kern &&
!ns_capable(net->user_ns, CAP_NET_RAW))
!current_has_cap(net, CAP_NET_RAW))
goto out_rcu_unlock;
sock->ops = answer->ops;

32
net/ipv6/af_inet6.c
View File

@@ -62,6 +62,10 @@
#include <asm/uaccess.h>
#include <linux/mroute6.h>
#ifdef CONFIG_ANDROID_PARANOID_NETWORK
#include <linux/android_aid.h>
#endif
MODULE_AUTHOR("Cast of dozens");
MODULE_DESCRIPTION("IPv6 protocol stack for Linux");
MODULE_LICENSE("GPL");
@@ -95,6 +99,29 @@ 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)
{
@@ -108,6 +135,9 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol,
int try_loading_module = 0;
int err;
if (!current_has_network())
return -EACCES;
if (sock->type != SOCK_RAW &&
sock->type != SOCK_DGRAM &&
!inet_ehash_secret)
@@ -160,7 +190,7 @@ lookup_protocol:
err = -EPERM;
if (sock->type == SOCK_RAW && !kern &&
!ns_capable(net->user_ns, CAP_NET_RAW))
!current_has_cap(net, CAP_NET_RAW))
goto out_rcu_unlock;
sock->ops = answer->ops;