| From cca00a381af198cc5a9a6e10822142dbaef4bd4a Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 26 Dec 2020 19:12:32 -0800 |
| Subject: Bluetooth: Fix initializing response id after clearing struct |
| |
| 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 be9640e9ca006..888813342cfc8 100644 |
| --- a/net/bluetooth/a2mp.c |
| +++ b/net/bluetooth/a2mp.c |
| @@ -388,9 +388,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 |
| |
