From patchwork Thu Nov 25 12:18:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrew hendry X-Patchwork-Id: 73045 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 A08F8B7043 for ; Thu, 25 Nov 2010 23:18:35 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752120Ab0KYMSa (ORCPT ); Thu, 25 Nov 2010 07:18:30 -0500 Received: from mail-gy0-f174.google.com ([209.85.160.174]:62246 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752136Ab0KYMS3 (ORCPT ); Thu, 25 Nov 2010 07:18:29 -0500 Received: by mail-gy0-f174.google.com with SMTP id 11so421210gyb.19 for ; Thu, 25 Nov 2010 04:18:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:content-type :date:message-id:mime-version:x-mailer:content-transfer-encoding; bh=xEWuVcJC0ZXD0U38eZthqfxgtvbQ56nVv7XT9sdQM3U=; b=HOl3iLEn3LDt8pVOj8zOdj+Ln8d3d7iPFATb20NxxPL6BZxf0ssfIqW4ZR++4Hae/V vvSbRO44hGoUBxjQjm9nqQv0ewhmSXYaTfXyK2c/71odT7GwCgrXSA4DMqJHLw4hQ0Jb rbwBgcKClynNxKy99Jb/axJ8ROsYa8raB6cSY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; b=TYQf/RwuB2Py5AmYzkFoil5F/MQBgNSb8IKLqqsQldiEL3OFhuCrKIr6/JhcLw0X87 NJOyM6Vo0GJ1deztRd+w/nAEqVY5SWI50cG+GIaLZppEocPqFAZluuT91LBlNU/lc+Zi ASBFibFgFu5x0SoAwz5p/8JkTxrB22SrYUBEo= Received: by 10.100.9.11 with SMTP id 11mr547795ani.229.1290687508945; Thu, 25 Nov 2010 04:18:28 -0800 (PST) Received: from [192.168.0.3] (124-168-112-41.dyn.iinet.net.au [124.168.112.41]) by mx.google.com with ESMTPS id c7sm754585ana.17.2010.11.25.04.18.25 (version=SSLv3 cipher=RC4-MD5); Thu, 25 Nov 2010 04:18:28 -0800 (PST) Subject: [PATCH net-next 3/5] X25 remove bkl from calluserdata ioctls From: Andrew Hendry To: netdev@vger.kernel.org Date: Thu, 25 Nov 2010 23:18:40 +1100 Message-ID: <1290687520.5053.41.camel@jaunty> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Andrew Hendry --- net/x25/af_x25.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 2518efa..e2eea0a 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -1512,11 +1512,11 @@ out_dtefac_release: } case SIOCX25GCALLUSERDATA: { - struct x25_calluserdata cud = x25->calluserdata; - lock_kernel(); - rc = copy_to_user(argp, &cud, - sizeof(cud)) ? -EFAULT : 0; - unlock_kernel(); + lock_sock(sk); + rc = copy_to_user(argp, &x25->calluserdata, + sizeof(x25->calluserdata)) + ? -EFAULT : 0; + release_sock(sk); break; } @@ -1524,15 +1524,15 @@ out_dtefac_release: struct x25_calluserdata calluserdata; rc = -EFAULT; - lock_kernel(); if (copy_from_user(&calluserdata, argp, sizeof(calluserdata))) break; rc = -EINVAL; if (calluserdata.cudlength > X25_MAX_CUD_LEN) break; + lock_sock(sk); x25->calluserdata = calluserdata; - unlock_kernel(); + release_sock(sk); rc = 0; break; }