lkml.org 
[lkml]   [2019]   [Dec]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 064/161] Bluetooth: missed cpu_to_le16 conversion in hci_init4_req
    Date
    From: Ben Dooks (Codethink) <ben.dooks@codethink.co.uk>

    [ 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 <ben.dooks@codethink.co.uk>
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 6bc679cd3481..d6d7364838f4 100644
    --- a/net/bluetooth/hci_core.c
    +++ b/net/bluetooth/hci_core.c
    @@ -802,8 +802,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


    \
     
     \ /
      Last update: 2019-12-29 18:23    [W:4.057 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site