From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759436AbYFCUla (ORCPT ); Tue, 3 Jun 2008 16:41:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756330AbYFCUhQ (ORCPT ); Tue, 3 Jun 2008 16:37:16 -0400 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:47080 "EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752780AbYFCUgw (ORCPT ); Tue, 3 Jun 2008 16:36:52 -0400 Date: Tue, 03 Jun 2008 13:28:26 -0700 (PDT) Message-Id: <20080603.132826.197798175.davem@davemloft.net> To: linux-wireless@vger.kernel.org CC: linville@tuxdriver.com, mokuno@sm.sony.co.jp, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/12]: wext: Pull ioctl permission checking out into helper function. From: David Miller X-Mailer: Mew version 5.2 on Emacs 22.1 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: David S. Miller --- net/wireless/wext.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/net/wireless/wext.c b/net/wireless/wext.c index a1cd19a..e96559e 100644 --- a/net/wireless/wext.c +++ b/net/wireless/wext.c @@ -1061,18 +1061,26 @@ static int wireless_process_ioctl(struct net *net, struct ifreq *ifr, unsigned i return -EOPNOTSUPP; } +/* If command is `set a parameter', or `get the encoding parameters', + * check if the user has the right to do it. + */ +static int wext_permission_check(unsigned int cmd) +{ + if ((IW_IS_SET(cmd) || cmd == SIOCGIWENCODE || cmd == SIOCGIWENCODEEXT) + && !capable(CAP_NET_ADMIN)) + return -EPERM; + + return 0; +} + /* entry point from dev ioctl */ int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd, void __user *arg) { - int ret; + int ret = wext_permission_check(cmd); - /* If command is `set a parameter', or - * `get the encoding parameters', check if - * the user has the right to do it */ - if ((IW_IS_SET(cmd) || cmd == SIOCGIWENCODE || cmd == SIOCGIWENCODEEXT) - && !capable(CAP_NET_ADMIN)) - return -EPERM; + if (ret) + return ret; dev_load(net, ifr->ifr_name); rtnl_lock(); -- 1.5.5.1.308.g1fbb5