From: Chia-chi Yeh <chiachi@android.com>
Date: Fri, 15 Jul 2011 22:32:57 +0000 (-0700)
Subject: net: Only NET_ADMIN is allowed to fully control TUN interfaces.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6eca735acf6eea1371555b66acb953a82f234e73;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

net: Only NET_ADMIN is allowed to fully control TUN interfaces.

Signed-off-by: Chia-chi Yeh <chiachi@android.com>
---

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index f0db770e8b2f..2228a539184a 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1886,6 +1886,12 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
 	int le;
 	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;