diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-07-21 14:39:06 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-07-21 14:39:06 -0700 |
| commit | d6348a53b9f9d776358b7261dfcdab06ffeafc78 (patch) | |
| tree | c457cfa36d17817d8e4b6f7e43452cc2e929246e /drivers/net/tun.c | |
| parent | 3371370efef73fef66926509b6e84248c6731c97 (diff) | |
| parent | d74348cebf7b883a872c5f0cfdf815855e08db5a (diff) | |
Merge branch 'upstream/android-3.0' into linaro-android-3.0
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 5235f48be1b..67e474ff1a9 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1238,6 +1238,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; |