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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 26CBEC2D0CE for ; Sun, 29 Dec 2019 17:41:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EA009206A4 for ; Sun, 29 Dec 2019 17:41:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641261; bh=jnlXGHJarNhgCCIlGpMbq+ekRLFn7DyckUxYb1beU54=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bmGKHD5yOwJKSLdmcUQu6Ts0nuDRJ5srMi3E6WsxhIfmaAywpJlxNK4eD+QMGy3tq McFmcTMANBpiQeCQGKJA6z1voEWxz4R7B7+dLB/hyvg2qFwCs5b8q6QDNYvnZKH5RR dKH8YoZenevXhAE2r1raqmXt722lZ05DkhAYMOAU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729054AbfL2Ra5 (ORCPT ); Sun, 29 Dec 2019 12:30:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:57398 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729039AbfL2Rav (ORCPT ); Sun, 29 Dec 2019 12:30:51 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 25B3D207FD; Sun, 29 Dec 2019 17:30:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577640650; bh=jnlXGHJarNhgCCIlGpMbq+ekRLFn7DyckUxYb1beU54=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2ldP9uPjTRfpH6LBEQEi7Zu2eTDvGc6d1ZpvPgetI0rJCZAPdYPjh91Z8aeSgQBzy fI3/3DA1xG6yqbpGg5yDLDSPM9gE98mUrPJznCSf0ZM6pww3I2ZTSrQMxA1ggwEqar 7VywO6+3i2sO0l8XIuK1Oi5wLVwpJJ6TLiFaN2UI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ben Dooks , Marcel Holtmann , Sasha Levin Subject: [PATCH 4.19 081/219] Bluetooth: missed cpu_to_le16 conversion in hci_init4_req Date: Sun, 29 Dec 2019 18:18:03 +0100 Message-Id: <20191229162517.892728927@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229162508.458551679@linuxfoundation.org> References: <20191229162508.458551679@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ben Dooks (Codethink) [ Upstream commit 727ea61a5028f8ac96f75ab34cb1b56e63fd9227 ] It looks like in hci_init4_req() the request is being initialised from cpu-endian data but the packet is specified to be little-endian. This causes an warning from sparse due to __le16 to u16 conversion. Fix this by using cpu_to_le16() on the two fields in the packet. net/bluetooth/hci_core.c:845:27: warning: incorrect type in assignment (different base types) net/bluetooth/hci_core.c:845:27: expected restricted __le16 [usertype] tx_len net/bluetooth/hci_core.c:845:27: got unsigned short [usertype] le_max_tx_len net/bluetooth/hci_core.c:846:28: warning: incorrect type in assignment (different base types) net/bluetooth/hci_core.c:846:28: expected restricted __le16 [usertype] tx_time net/bluetooth/hci_core.c:846:28: got unsigned short [usertype] le_max_tx_time Signed-off-by: Ben Dooks Signed-off-by: Marcel Holtmann Signed-off-by: Sasha Levin --- net/bluetooth/hci_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 5afd67ef797a..e0de9a609265 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -841,8 +841,8 @@ static int hci_init4_req(struct hci_request *req, unsigned long opt) if (hdev->le_features[0] & HCI_LE_DATA_LEN_EXT) { struct hci_cp_le_write_def_data_len cp; - cp.tx_len = hdev->le_max_tx_len; - cp.tx_time = hdev->le_max_tx_time; + cp.tx_len = cpu_to_le16(hdev->le_max_tx_len); + cp.tx_time = cpu_to_le16(hdev->le_max_tx_time); hci_req_add(req, HCI_OP_LE_WRITE_DEF_DATA_LEN, sizeof(cp), &cp); } -- 2.20.1