Merge 4.14.25 into android-4.14

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / drivers / net / tun.c

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index bc38d54e37b92a304fa0c335eb5f58632633d0d5..0fd45ea34312f586e1786fc8883ea36d43916633 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -2283,6 +2283,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) == SOCK_IOC_TYPE) {
                if (copy_from_user(&ifr, argp, ifreq_len))
                        return -EFAULT;