From patchwork Thu Nov 25 12:18:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrew hendry X-Patchwork-Id: 73046 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 3A375B70A9 for ; Thu, 25 Nov 2010 23:19:11 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752392Ab0KYMSi (ORCPT ); Thu, 25 Nov 2010 07:18:38 -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 S1752237Ab0KYMSg (ORCPT ); Thu, 25 Nov 2010 07:18:36 -0500 Received: by mail-gy0-f174.google.com with SMTP id 11so421210gyb.19 for ; Thu, 25 Nov 2010 04:18:36 -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=mOrFLiRvR0F7visf974xod+uW/IABp1TGeygYTMYpNI=; b=J2sv9RbLSA05Qa82vg8TAuMtkvz3jIvQhmsYyEXFwQc5DA5weoIxdc3LWZRW8sNgHN NDCyaEMxVjQTQTnqCQQY6GpWv4117ODobxeEPX2m2zCLyc7yROWv+BjjPOZBR30Zl4aG kXLg/OIjGp83XK9fmsQpEGn346BGEn4GxB1Hk= 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=iayqsn54jPsmESWRFpgqvz9El7c5TCKL/99K9WUQYDlxH/0j4nD1+KT368SisPcK/P 1H7nMrxPM8nKkuo59dZbJX+ul1egNQm6LQLmVs5zNUmYp5q6Dq7DPoWr6rAPoRYqYHv8 Hwj23HariQ6JG3iup2WI9ClD8BL1niwisV12w= Received: by 10.90.253.6 with SMTP id a6mr2657948agi.41.1290687516183; Thu, 25 Nov 2010 04:18:36 -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 d10sm751273and.39.2010.11.25.04.18.32 (version=SSLv3 cipher=RC4-MD5); Thu, 25 Nov 2010 04:18:33 -0800 (PST) Subject: [PATCH net-next 4/5] X25 remove bkl from causediag ioctls From: Andrew Hendry To: netdev@vger.kernel.org Date: Thu, 25 Nov 2010 23:18:43 +1100 Message-ID: <1290687523.5053.42.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 | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index e2eea0a..8cfc419 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -1538,23 +1538,22 @@ out_dtefac_release: } case SIOCX25GCAUSEDIAG: { - struct x25_causediag causediag; - lock_kernel(); - causediag = x25->causediag; - rc = copy_to_user(argp, &causediag, - sizeof(causediag)) ? -EFAULT : 0; - unlock_kernel(); + lock_sock(sk); + rc = copy_to_user(argp, &x25->causediag, + sizeof(x25->causediag)) + ? -EFAULT : 0; + release_sock(sk); break; } case SIOCX25SCAUSEDIAG: { struct x25_causediag causediag; rc = -EFAULT; - lock_kernel(); if (copy_from_user(&causediag, argp, sizeof(causediag))) break; + lock_sock(sk); x25->causediag = causediag; - unlock_kernel(); + release_sock(sk); rc = 0; break;