From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE6A7C2BA19 for ; Sat, 11 Apr 2020 23:20:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 98528206E9 for ; Sat, 11 Apr 2020 23:20:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586647200; bh=nU2lBQdXFq/PwgMdWlj3MWrtOBKp5uayA8jjATclXyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XEFOnQXBTUvSgkracH/UuImuyOPm5fa63Aq+TpxgDyGg8YGkyPPIJ6aovebwH/Qkf +5sKm82ji9Fx6D0ghBLmHw1B7xGgQAOQ3eYMOIIOiYIUzbRT8WjAl7C9LegQxhuGWW 9zzg4RlHxkOHXvdYv1z8a43BQy46EpQd+PWELRFY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730566AbgDKXNq (ORCPT ); Sat, 11 Apr 2020 19:13:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:55060 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730544AbgDKXNo (ORCPT ); Sat, 11 Apr 2020 19:13:44 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5AECC215A4; Sat, 11 Apr 2020 23:13:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586646824; bh=nU2lBQdXFq/PwgMdWlj3MWrtOBKp5uayA8jjATclXyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YSb8s7rFuXUoRuz9OroWuGV3sSBVriLiCkqVCzG6bdvnYVMQVFhdxQ6AcpU8b74U/ 7LvMD8OlYE9PmVTh/jnwVn7mBwtC12l5JOsErep4lspzHRHwSrJBHRSTxafhTavdcw Jks+OLgxZARUZTfCOhSu1opbzNsfYWavUbKBr6Ns= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Marcel Holtmann , Johan Hedberg , Sasha Levin , linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 14/37] Bluetooth: Fix calculation of SCO handle for packet processing Date: Sat, 11 Apr 2020 19:13:03 -0400 Message-Id: <20200411231327.26550-14-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200411231327.26550-1-sashal@kernel.org> References: <20200411231327.26550-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Marcel Holtmann [ Upstream commit debdedf2eb5a2d9777cabff40900772be13cd9f9 ] When processing SCO packets, the handle is wrongly assumed as 16-bit value. The actual size is 12-bits and the other 4-bits are used for packet flags. Signed-off-by: Marcel Holtmann Signed-off-by: Johan Hedberg Signed-off-by: Sasha Levin --- net/bluetooth/hci_core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index ff80a9d41ce17..18a676900e5b0 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -4078,13 +4078,16 @@ static void hci_scodata_packet(struct hci_dev *hdev, struct sk_buff *skb) { struct hci_sco_hdr *hdr = (void *) skb->data; struct hci_conn *conn; - __u16 handle; + __u16 handle, flags; skb_pull(skb, HCI_SCO_HDR_SIZE); handle = __le16_to_cpu(hdr->handle); + flags = hci_flags(handle); + handle = hci_handle(handle); - BT_DBG("%s len %d handle 0x%4.4x", hdev->name, skb->len, handle); + BT_DBG("%s len %d handle 0x%4.4x flags 0x%4.4x", hdev->name, skb->len, + handle, flags); hdev->stat.sco_rx++; -- 2.20.1