From patchwork Thu Nov 25 12:18:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrew hendry X-Patchwork-Id: 73047 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 79155B70A9 for ; Thu, 25 Nov 2010 23:19:12 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752971Ab0KYMSo (ORCPT ); Thu, 25 Nov 2010 07:18:44 -0500 Received: from mail-yw0-f46.google.com ([209.85.213.46]:41193 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752918Ab0KYMSm (ORCPT ); Thu, 25 Nov 2010 07:18:42 -0500 Received: by ywl5 with SMTP id 5so424671ywl.19 for ; Thu, 25 Nov 2010 04:18:41 -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=8SJ3S4x1wHQkPFVVCGsKibNozoXdmF692cfdre2CO5Q=; b=QYjaNm1pmFjNmN3yoqyK3I95exVNC11dhA2HqDVs3jbD9W4wuR5j6aGPPFCrffTp4j 65669JU4Q3w8hpW6PJkXP0dScIY/HBQgT0w2jEM4u4GIM1ECWvrWXcNEw1oYmkru1M9Z lWMds6ZMFwvJWINyLLRwHgkKOpQn/Rf9lnahc= 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=r9XKTmgSFm6tCGGPB5I2O4phUDfGjzF4auhY57GnYs0M7Xdv9uYH8sKl8rN2YrMmPm CHFvq7YcFOqtdofkK1wMTYKO/rmZKoAYWzPt0eVvZONPYUwHs6HVbGR12KVLC8giXH7S GsILNPqbWBo163hEoHgxczIvLCOtkMIuQJzQE= Received: by 10.151.49.15 with SMTP id b15mr2933869ybk.317.1290687521452; Thu, 25 Nov 2010 04:18:41 -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 r6sm1790771yba.11.2010.11.25.04.18.39 (version=SSLv3 cipher=RC4-MD5); Thu, 25 Nov 2010 04:18:40 -0800 (PST) Subject: [PATCH net-next 5/5] X25 remove bkl in call user data length ioctl From: Andrew Hendry To: netdev@vger.kernel.org Date: Thu, 25 Nov 2010 23:18:45 +1100 Message-ID: <1290687525.5053.43.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 | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 8cfc419..ad96ee9 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -1562,19 +1562,20 @@ out_dtefac_release: case SIOCX25SCUDMATCHLEN: { struct x25_subaddr sub_addr; rc = -EINVAL; - lock_kernel(); + lock_sock(sk); if(sk->sk_state != TCP_CLOSE) - break; + goto out_cud_release; rc = -EFAULT; if (copy_from_user(&sub_addr, argp, sizeof(sub_addr))) - break; + goto out_cud_release; rc = -EINVAL; if(sub_addr.cudmatchlength > X25_MAX_CUD_LEN) - break; + goto out_cud_release; x25->cudmatchlength = sub_addr.cudmatchlength; - unlock_kernel(); rc = 0; +out_cud_release: + release_sock(sk); break; }