diff --git a/[refs] b/[refs] index c9998890578b..1e60fff20e72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a5645bc901aea6f3f446888061b2b084bbf1ba6 +refs/heads/master: 1bded710a574f20d41bc9e7fb531301db282d623 diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c index 457f2d7430cf..15d67635bb10 100644 --- a/trunk/drivers/net/tun.c +++ b/trunk/drivers/net/tun.c @@ -123,7 +123,7 @@ static int tun_attach(struct tun_struct *tun, struct file *file) /* Check permissions */ if (((tun->owner != -1 && cred->euid != tun->owner) || - (tun->group != -1 && cred->egid != tun->group)) && + (tun->group != -1 && !in_egroup_p(tun->group))) && !capable(CAP_NET_ADMIN)) return -EPERM;