Commit 858b98d0 authored by Christopher William Snowhill's avatar Christopher William Snowhill Committed by Greg Kroah-Hartman
Browse files

Bluetooth: Fix initializing response id after clearing struct 



[ Upstream commit a5687c64 ]

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: eddb7732 ("Bluetooth: A2MP: Fix not initializing all members")
Signed-off-by: default avatarChristopher William Snowhill <chris@kode54.net>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2dfbc497

net/bluetooth/a2mp.c

+1 −1
Original line number Diff line number Diff line
@@ -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;