aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorChia-chi Yeh <chiachi@android.com>2011-07-15 15:32:57 -0700
committerArve Hjønnevåg <arve@android.com>2013-07-01 13:40:37 -0700
commitf25c23e12ec17e3ec25a4db8bf97901ad891e32d (patch)
treecd9799d2299e610c7c680b6b5b52da95a7ee75d1 /drivers/net
parent19d2b31c931e7fc8c33ee4d455005bb8e8790274 (diff)
net: Only NET_ADMIN is allowed to fully control TUN interfaces.
Signed-off-by: Chia-chi Yeh <chiachi@android.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/tun.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 9c61f8734a4..eb5609bc9e5 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1864,6 +1864,12 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
int vnet_hdr_sz;
int ret;
+#ifdef CONFIG_ANDROID_PARANOID_NETWORK
+ if (cmd != TUNGETIFF && !capable(CAP_NET_ADMIN)) {
+ return -EPERM;
+ }
+#endif
+
if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
if (copy_from_user(&ifr, argp, ifreq_len))
return -EFAULT;