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-Tag: 2.1b_release~2402
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=67ed490cf851636a1ffcf94906a192186121a674;p=platform%2Fkernel%2Fkernel-mfld-blackbay.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 fb50e5a..76b8650 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1239,6 +1239,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 || _IOC_TYPE(cmd) == 0x89)
 		if (copy_from_user(&ifr, argp, ifreq_len))
 			return -EFAULT;