From patchwork Wed Feb 29 17:06:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: santosh nayak X-Patchwork-Id: 143790 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 07AB3B6FA2 for ; Thu, 1 Mar 2012 04:08:02 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030916Ab2B2RHr (ORCPT ); Wed, 29 Feb 2012 12:07:47 -0500 Received: from mail-pw0-f66.google.com ([209.85.160.66]:54859 "EHLO mail-pw0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755762Ab2B2RHp (ORCPT ); Wed, 29 Feb 2012 12:07:45 -0500 Received: by pbbrq13 with SMTP id rq13so29801pbb.1 for ; Wed, 29 Feb 2012 09:07:45 -0800 (PST) Received-SPF: pass (google.com: domain of santoshprasadnayak@gmail.com designates 10.68.136.97 as permitted sender) client-ip=10.68.136.97; Authentication-Results: mr.google.com; spf=pass (google.com: domain of santoshprasadnayak@gmail.com designates 10.68.136.97 as permitted sender) smtp.mail=santoshprasadnayak@gmail.com; dkim=pass header.i=santoshprasadnayak@gmail.com Received: from mr.google.com ([10.68.136.97]) by 10.68.136.97 with SMTP id pz1mr9096510pbb.30.1330535265227 (num_hops = 1); Wed, 29 Feb 2012 09:07:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=InmgwkhMy7ODFeLasRpQ08qzWyFP6KuU7oYrxuzR74M=; b=HeAT5VS+ckVoNQFLnwFL+7jpzlJOsWX3pLikTwndLHoiHDCkfsy2jvFN5lmFVHFlmR nfWus9SW/3j+OtTyLZuNVZ2034uiI7JvMenoXV3sG3EukVn3iMwD92/To3eYRNZofGUI QsC91qhMT99q30DbZV3jqzPtQDhcGBk/baKII= Received: by 10.68.136.97 with SMTP id pz1mr7655473pbb.30.1330535265082; Wed, 29 Feb 2012 09:07:45 -0800 (PST) Received: from localhost.localdomain ([115.118.216.220]) by mx.google.com with ESMTPS id b6sm19131305pbf.32.2012.02.29.09.07.40 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 29 Feb 2012 09:07:44 -0800 (PST) From: santosh nayak To: marcel@holtmann.org Cc: padovan@profusion.mobi, davem@davemloft.net, linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Santosh Nayak Subject: [PATCH] Bluetooth: Silence static checker warning. Date: Wed, 29 Feb 2012 22:36:57 +0530 Message-Id: <1330535217-26785-1-git-send-email-santoshprasadnayak@gmail.com> X-Mailer: git-send-email 1.7.4.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Santosh Nayak Silencing Static checker warning. 1. Endian warning 2. variable dereferenced before check 'sk' . Signed-off-by: Santosh Nayak Acked-by: Marcel Holtmann --- net/bluetooth/l2cap_sock.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 401d942..d206321 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -82,7 +82,7 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen) } if (la.l2_cid) - err = l2cap_add_scid(chan, la.l2_cid); + err = l2cap_add_scid(chan, __le16_to_cpu(la.l2_cid)); else err = l2cap_add_psm(chan, &la.l2_bdaddr, la.l2_psm); @@ -123,7 +123,8 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, int al if (la.l2_cid && la.l2_psm) return -EINVAL; - err = l2cap_chan_connect(chan, la.l2_psm, la.l2_cid, &la.l2_bdaddr); + err = l2cap_chan_connect(chan, la.l2_psm, __le16_to_cpu(la.l2_cid), + &la.l2_bdaddr); if (err) goto done; @@ -795,7 +796,7 @@ static void l2cap_sock_kill(struct sock *sk) static int l2cap_sock_shutdown(struct socket *sock, int how) { struct sock *sk = sock->sk; - struct l2cap_chan *chan = l2cap_pi(sk)->chan; + struct l2cap_chan *chan; int err = 0; BT_DBG("sock %p, sk %p", sock, sk); @@ -803,6 +804,8 @@ static int l2cap_sock_shutdown(struct socket *sock, int how) if (!sk) return 0; + chan = l2cap_pi(sk)->chan; + lock_sock(sk); if (!sk->sk_shutdown) { if (chan->mode == L2CAP_MODE_ERTM)