Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 120667
b: refs/heads/master
c: ee9785a
h: refs/heads/master
i:
  120665: 3a84eeb
  120663: e986026
v: v3
  • Loading branch information
David Howells authored and James Morris committed Nov 13, 2008
1 parent f0f6348 commit 02b7021
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0e164b685cab357546a9a09ef234922b82ecbfaf
refs/heads/master: ee9785ada3573700efe77b78c03d4e26a4e1bf26
4 changes: 2 additions & 2 deletions trunk/drivers/net/tun.c
Original file line number Diff line number Diff line change
Expand Up @@ -712,9 +712,9 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)

/* Check permissions */
if (((tun->owner != -1 &&
current->euid != tun->owner) ||
current_euid() != tun->owner) ||
(tun->group != -1 &&
current->egid != tun->group)) &&
current_egid() != tun->group)) &&
!capable(CAP_NET_ADMIN))
return -EPERM;
}
Expand Down

0 comments on commit 02b7021

Please sign in to comment.