From patchwork Tue Sep 14 23:31:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrew hendry X-Patchwork-Id: 64766 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 D8C03B70AF for ; Wed, 15 Sep 2010 09:31:48 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755135Ab0INXbo (ORCPT ); Tue, 14 Sep 2010 19:31:44 -0400 Received: from mail-vw0-f46.google.com ([209.85.212.46]:59587 "EHLO mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755054Ab0INXbo (ORCPT ); Tue, 14 Sep 2010 19:31:44 -0400 Received: by mail-vw0-f46.google.com with SMTP id 3so439029vws.19 for ; Tue, 14 Sep 2010 16:31:43 -0700 (PDT) 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=FegggnyqAfXjMv5xy3arYEcGOIjHWvLzAhb5731Juvs=; b=NkH3PqfyabxnZ4NfYeW31qiczWOI/tItMcWZ0uF6y0dwAYmYjVj01we9ctFLBvCpOF JsF5eWdCNW5ClPYhq4JQnyofumBeIkTd10IHEkPlJNMrCCfmqDqEDcoG4dYFXcvN21aW MXeYpUMbFxfvIKWW+5zCw9ZhwXO9OzwogPjRU= 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=rlw6/IR1E4HdN9J8O+iGNVXqhpXFXK463Bq4pe2HJhpHMMf8O4q+ZI79JtMmalkews WIchZkkYrzNbqqZ53U1r8Ajv1IHcx8I/OKDLmyQJgRJfpNquEF8EelssoXgtkDtFS1a5 ZwhluojKlWfuov5/xouRKq0Lvw3w++g99k43k= Received: by 10.220.128.29 with SMTP id i29mr401599vcs.2.1284507103680; Tue, 14 Sep 2010 16:31:43 -0700 (PDT) Received: from [192.168.0.3] (124-168-120-nwork.dyn.iinet.net.au [124.168.120.0]) by mx.google.com with ESMTPS id b9sm128034vci.39.2010.09.14.16.31.41 (version=SSLv3 cipher=RC4-MD5); Tue, 14 Sep 2010 16:31:43 -0700 (PDT) Subject: [PATCH 2/4] X.25 remove bkl in bind From: Andrew Hendry To: netdev@vger.kernel.org Date: Wed, 15 Sep 2010 09:31:38 +1000 Message-ID: <1284507098.1742.55.camel@jaunty> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Accept updates socket values in 3 lines so wrapped with lock_sock. Signed-off-by: Andrew Hendry --- net/x25/af_x25.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index f6a8f17..bd6fce3 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -688,7 +688,6 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) struct sockaddr_x25 *addr = (struct sockaddr_x25 *)uaddr; int len, i, rc = 0; - lock_kernel(); if (!sock_flag(sk, SOCK_ZAPPED) || addr_len != sizeof(struct sockaddr_x25) || addr->sx25_family != AF_X25) { @@ -704,12 +703,13 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) } } + lock_sock(sk); x25_sk(sk)->source_addr = addr->sx25_addr; x25_insert_socket(sk); sock_reset_flag(sk, SOCK_ZAPPED); + release_sock(sk); SOCK_DEBUG(sk, "x25_bind: socket is bound\n"); out: - unlock_kernel(); return rc; }