From patchwork Thu Mar 1 10:59:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: santosh nayak X-Patchwork-Id: 143987 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 23A9E1007D2 for ; Thu, 1 Mar 2012 22:00:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758497Ab2CALAL (ORCPT ); Thu, 1 Mar 2012 06:00:11 -0500 Received: from mail-pw0-f66.google.com ([209.85.160.66]:63588 "EHLO mail-pw0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758233Ab2CALAJ (ORCPT ); Thu, 1 Mar 2012 06:00:09 -0500 Received: by pbbrq13 with SMTP id rq13so428201pbb.1 for ; Thu, 01 Mar 2012 03:00:09 -0800 (PST) Received-SPF: pass (google.com: domain of santoshprasadnayak@gmail.com designates 10.68.129.228 as permitted sender) client-ip=10.68.129.228; Authentication-Results: mr.google.com; spf=pass (google.com: domain of santoshprasadnayak@gmail.com designates 10.68.129.228 as permitted sender) smtp.mail=santoshprasadnayak@gmail.com; dkim=pass header.i=santoshprasadnayak@gmail.com Received: from mr.google.com ([10.68.129.228]) by 10.68.129.228 with SMTP id nz4mr1039057pbb.91.1330599609095 (num_hops = 1); Thu, 01 Mar 2012 03:00:09 -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=j2qYSLAincwkNUSoVgJmWfRgM4TcYhrgNynQWysZLhc=; b=gBK1N2eC2B6topB3cIa5p6pXfN95nlyNcijz1INlJGWEbgrnpI86q+LdSq+LpSnSqw xZM6Je3p6m5ylRldXUCVufb3Mnk5enELYrkpGUr/O4qHOvFEXay8UdKq/GqHZiqWBNk5 p+TqAMYoHpc7C1fHTyOSgUbESrHBESqKCGN/A= Received: by 10.68.129.228 with SMTP id nz4mr876249pbb.91.1330599608968; Thu, 01 Mar 2012 03:00:08 -0800 (PST) Received: from localhost.localdomain ([64.103.156.75]) by mx.google.com with ESMTPS id d4sm1809428pbe.36.2012.03.01.03.00.05 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Mar 2012 03:00:08 -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: Resend: [PATCH] Bluetooth: Fix Endian Bug. Date: Thu, 1 Mar 2012 16:29:21 +0530 Message-Id: <1330599561-20392-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 Fix for endian bug. Fix for null dereferenced removed as it is already submitted by Andrei. Signed-off-by: Santosh Nayak --- net/bluetooth/l2cap_sock.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 401d942..86d5067 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;