From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B3CED280A5C; Wed, 23 Apr 2025 14:47:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745419631; cv=none; b=X8uQ6rQJSXZdmmLzLE4iopbpVzu2ojCLDRdQQuIGjkHk7SHTgsl3aBszJa6AMR+7bXGbOO7MsygLXGjTkpkIsRi3UeCBz+fLSSdcNjSm7QDJHZvnl0vKkhspDroYF9fuH6KKbiSSFX6LbWQn9WfHaE51ueZNDDlrmivFjXeEWpk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745419631; c=relaxed/simple; bh=qbJ9cXhEe9uj1xOREdA8n+AM5aAzDx8fqFIO4rjOqtg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SiCO1jD8Leg9YXAUOozC9e8M84Q504Qxwycs9q8RtjFS2RijPx1CX4AaDSTwIM+QuYxWl5ZnLyBf7jjNKn4m7andF5y6CdwAXAw639VmVb9R1a2pRJ+WFEEZaLHP0w5zKdsLZ2WKvyz00+RV8iSxd+ndZCAT/b4P6bt/1+6HPlI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lMMCeCcL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="lMMCeCcL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D38A9C4CEE2; Wed, 23 Apr 2025 14:47:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745419631; bh=qbJ9cXhEe9uj1xOREdA8n+AM5aAzDx8fqFIO4rjOqtg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lMMCeCcLJ9qwEfky7l2Ub/gT6mAwz+wYobSnOJHYVMfe1KMfpY8T5CYBXfU/F/NZj qmc5roqfPi/eLu9VJPZhp1LSnwRUuJiKsJhtjE20kxnLkRAu7Uuu/7SvGxXnOt6+oZ P58bXT5pWJjAROiWZdXeuk1p4LGhj7LKVKG2grR8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Luiz Augusto von Dentz , Sasha Levin Subject: [PATCH 6.12 027/223] Bluetooth: hci_event: Fix sending MGMT_EV_DEVICE_FOUND for invalid address Date: Wed, 23 Apr 2025 16:41:39 +0200 Message-ID: <20250423142618.218897106@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423142617.120834124@linuxfoundation.org> References: <20250423142617.120834124@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Luiz Augusto von Dentz [ Upstream commit eb73b5a9157221f405b4fe32751da84ee46b7a25 ] This fixes sending MGMT_EV_DEVICE_FOUND for invalid address (00:00:00:00:00:00) which is a regression introduced by a2ec905d1e16 ("Bluetooth: fix kernel oops in store_pending_adv_report") since in the attempt to skip storing data for extended advertisement it actually made the code to skip the entire if statement supposed to send MGMT_EV_DEVICE_FOUND without attempting to use the last_addr_adv which is garanteed to be invalid for extended advertisement since we never store anything on it. Link: https://github.com/bluez/bluez/issues/1157 Link: https://github.com/bluez/bluez/issues/1149#issuecomment-2767215658 Fixes: a2ec905d1e16 ("Bluetooth: fix kernel oops in store_pending_adv_report") Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- net/bluetooth/hci_event.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index d64117be62cc4..96ad1b75d1c4d 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -6150,11 +6150,12 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr, * event or send an immediate device found event if the data * should not be stored for later. */ - if (!ext_adv && !has_pending_adv_report(hdev)) { + if (!has_pending_adv_report(hdev)) { /* If the report will trigger a SCAN_REQ store it for * later merging. */ - if (type == LE_ADV_IND || type == LE_ADV_SCAN_IND) { + if (!ext_adv && (type == LE_ADV_IND || + type == LE_ADV_SCAN_IND)) { store_pending_adv_report(hdev, bdaddr, bdaddr_type, rssi, flags, data, len); return; -- 2.39.5