lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0417/1039] Bluetooth: hci_sock: fix endian bug in hci_sock_setsockopt()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit b9f9dbad0bd1c302d357fdd327c398f51f5fc2b1 ]

    This copies a u16 into the high bits of an int, which works on a big
    endian system but not on a little endian system.

    Fixes: 09572fca7223 ("Bluetooth: hci_sock: Add support for BT_{SND,RCV}BUF")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/bluetooth/hci_sock.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
    index d0dad1fafe079..f2506e656f3e4 100644
    --- a/net/bluetooth/hci_sock.c
    +++ b/net/bluetooth/hci_sock.c
    @@ -1915,7 +1915,8 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
    sockptr_t optval, unsigned int len)
    {
    struct sock *sk = sock->sk;
    - int err = 0, opt = 0;
    + int err = 0;
    + u16 opt;

    BT_DBG("sk %p, opt %d", sk, optname);

    @@ -1941,7 +1942,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
    goto done;
    }

    - if (copy_from_sockptr(&opt, optval, sizeof(u16))) {
    + if (copy_from_sockptr(&opt, optval, sizeof(opt))) {
    err = -EFAULT;
    break;
    }
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 23:10    [W:13.726 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site