lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 016/340] Bluetooth: Fix initializing response id after clearing struct
    Date
    From: Christopher William Snowhill <chris@kode54.net>

    [ Upstream commit a5687c644015a097304a2e47476c0ecab2065734 ]

    Looks like this was missed when patching the source to clear the structures
    throughout, causing this one instance to clear the struct after the response
    id is assigned.

    Fixes: eddb7732119d ("Bluetooth: A2MP: Fix not initializing all members")
    Signed-off-by: Christopher William Snowhill <chris@kode54.net>
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/bluetooth/a2mp.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
    index da7fd7c8c2dc0..cc26e4c047ad0 100644
    --- a/net/bluetooth/a2mp.c
    +++ b/net/bluetooth/a2mp.c
    @@ -381,9 +381,9 @@ static int a2mp_getampassoc_req(struct amp_mgr *mgr, struct sk_buff *skb,
    hdev = hci_dev_get(req->id);
    if (!hdev || hdev->amp_type == AMP_TYPE_BREDR || tmp) {
    struct a2mp_amp_assoc_rsp rsp;
    - rsp.id = req->id;

    memset(&rsp, 0, sizeof(rsp));
    + rsp.id = req->id;

    if (tmp) {
    rsp.status = A2MP_STATUS_COLLISION_OCCURED;
    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-01 22:35    [W:3.291 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site