diff options
| author | Eric Miao <eric.miao@linaro.org> | 2011-10-22 09:32:05 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2011-10-22 09:32:05 +0800 |
| commit | 596804675e0eae9abac11e8d65bf132f77845bf3 (patch) | |
| tree | f52fb0f8d2aaf38a6fb0e729e9ad293205c1b09d /drivers/net/tun.c | |
| parent | 78b86052c5e36ba18b70f4b2ea6f518a2c9dbc1d (diff) | |
| parent | 0927679c26e461abdce8704bfb5dea7646570109 (diff) | |
Merge branch 'linaro-android-3.1-fport' of git://git.linaro.org/people/jstultz/android into lt-3.1-android
Diffstat (limited to 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 71f3d1a35b7..a024708b570 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1243,6 +1243,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; |