From patchwork Tue Dec 11 11:03:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 205176 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1BF982C0082 for ; Tue, 11 Dec 2012 22:12:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753386Ab2LKLLw (ORCPT ); Tue, 11 Dec 2012 06:11:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:64604 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752984Ab2LKLLu (ORCPT ); Tue, 11 Dec 2012 06:11:50 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBBBBnaA014271 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 11 Dec 2012 06:11:50 -0500 Received: from amd-6168-8-1.englab.nay.redhat.com (amd-6168-8-1.englab.nay.redhat.com [10.66.104.52]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qBBBBiYx023631; Tue, 11 Dec 2012 06:11:47 -0500 From: Jason Wang To: mst@redhat.com, pmoore@redhat.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: mprivozn@redhat.com, Jason Wang Subject: [PATCH net-next rfc 1/2] tuntap: forbid calling TUNSETQUEUE for a persistent device with no queues Date: Tue, 11 Dec 2012 19:03:46 +0800 Message-Id: <1355223827-57290-2-git-send-email-jasowang@redhat.com> In-Reply-To: <1355223827-57290-1-git-send-email-jasowang@redhat.com> References: <1355223827-57290-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When re-establish to a persistent deivce wihout queues attached, TUNSETIFF should be called instead of TUNSETQUEUE to do the proper permission checking. Signed-off-by: Jason Wang --- drivers/net/tun.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 14a0454..d593f56 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1771,6 +1771,9 @@ static int tun_set_queue(struct file *file, struct ifreq *ifr) ret = -EINVAL; else if (tun_not_capable(tun)) ret = -EPERM; + /* TUNSETIFF is needed to do permission checking */ + else if (tun->numqueues == 0) + ret = -EPERM; else ret = tun_attach(tun, file); } else if (ifr->ifr_flags & IFF_DETACH_QUEUE)