From nobody Thu Apr 2 20:20:25 2026 Received: from AM0PR02CU008.outbound.protection.outlook.com (mail-westeuropeazon11023095.outbound.protection.outlook.com [52.101.72.95]) (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 73D23366806; Thu, 26 Mar 2026 14:34:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.72.95 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774535676; cv=fail; b=HpxfJdTdBbFx3qxuEk8JU6CrPIm4UmyYWqtEQhoknYLPxThwyEzNaVqRDYCjoyMSX49RsQCrPGtKmbaVKJNTS+PsRR0/dkRxpu2mI8cylaqZnOQUhhKzghsyjoxC09FXMn14O1Sp+Eh0tnKf8ixv6Y/okXtgY3eew40fJPKQV/U= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774535676; c=relaxed/simple; bh=eluFFoHv64TwPcv2oFp/UWnOmFAEMI+yYJD0U5TV01M=; h=From:To:CC:Subject:Date:Message-ID:Content-Type:MIME-Version; b=iBEqzZjMBmlKfzqXWflJlZKBL6XDZtjrFCdI8Feh3asjRltlV0sXTHlnQ33jmqwRFrTa5ptzmGAOMn+EVsM/5xQypi/MotIirRnB2jQXJ1EhPpqL6PFAv8udmhWZQ1wc3tzr4j4AJvpewfLHztql8Ec/GdrAu0ix7+QQ/sDCxL8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=1seal.org; spf=pass smtp.mailfrom=1seal.org; dkim=pass (2048-bit key) header.d=1seal.org header.i=@1seal.org header.b=AqguZhIP; arc=fail smtp.client-ip=52.101.72.95 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=1seal.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=1seal.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=1seal.org header.i=@1seal.org header.b="AqguZhIP" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Oq2E2BAQ9OCoN5+QDgzRP1uoBEjwIvr8k3ilsTu7Cvc/bnR/8F6ZLEDTcfR2O32LYfThVBq75pjWZyC1jQnKkRotdAWMv9xaqMPdTHYr7nayyiOOOKdIZSFcupucJKnCebeaKRfTxr/ZQhBGlvURzZHC+4bhtsEmT++WsLBz2BoqrM1Tu1RTbwm5tUC0GCfI4ZS/oix/XnFUEhBwqmtRyRI8Fl2Z/t0V03XXb7BFQR6dqhhzFvijznSb2GMFbr5iTRFOi6YlRA4FiRBbqRQiMxkbDefS9XS7pEB1KoJ8c0RqOD9+4Po9rBwb6Ts8HBv2Rf1UqVj31Gy7VLH8Re6YyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=eluFFoHv64TwPcv2oFp/UWnOmFAEMI+yYJD0U5TV01M=; b=lKwpZHpU8+onOw/ZSmd3rNTNkofN1LmHUQUmzKX1nVbRwX9MpDtdF3DDDeKSPOEZfkxJa8ImU/ZSRbhEA6k68FMqbXRgvPrlL7pc4a07Nv1F+zTqaItQ+nLTUfHrJcI6PhKjBU2UepjKAQhnaqm44gt+zW30DLPCiqZY/oIfX6PTj3Pv5D7KeLALbjyhPvlK4RsdIrKpnDh+uM3Eyufu0LBbPH9jaP9NZl4CUqsX2omYv+lVQLjcKpohw/GuWLEPG/j7qZ8302suVMoRF0SFrzv4kVIL0syhCPEhzy14CyGtyc2Zh870hj0uhUHq6z03yhlDKLr/CaxfZn2wHtRJKQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=1seal.org; dmarc=pass action=none header.from=1seal.org; dkim=pass header.d=1seal.org; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1seal.org; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eluFFoHv64TwPcv2oFp/UWnOmFAEMI+yYJD0U5TV01M=; b=AqguZhIPobAlzdd1P/71o53LDPnRTW6Pw983jT4uBj++jy6AyQuM2rhopSZ0NB2pbhfRbsV+70yaKqQquIMRVV6jv5hWQ4dig4xUH1kzToBRIsaF0CPeSTOfx6pXRzi9+dXjGomsFCundB6vlYmF8x8dvMnV0a1veIg7kBioTtMTYuFZU71wdFOOntfJPmbUs4pv2J1bgSSQOp6hLFgJPupC9VYh1VplQDUSIl9CLvy5qgwOfQgbb7LWOQsohH3F8EKf963bJ5kvd/MDxYKb5bVxBPXqSUxYakiRxf1zRWxNfDJ+ksmoPAtiVSHVZ7oAbiGXmsepMugzozNFWG9Uyg== Received: from PA4PR04MB7679.eurprd04.prod.outlook.com (2603:10a6:102:e0::20) by FRRPR04MB12596.eurprd04.prod.outlook.com (2603:10a6:d10:1d0::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9745.20; Thu, 26 Mar 2026 14:34:30 +0000 Received: from PA4PR04MB7679.eurprd04.prod.outlook.com ([fe80::7e8:b5fc:9762:7a6d]) by PA4PR04MB7679.eurprd04.prod.outlook.com ([fe80::7e8:b5fc:9762:7a6d%5]) with mapi id 15.20.9723.030; Thu, 26 Mar 2026 14:34:30 +0000 From: Oleh Konko To: "linux-bluetooth@vger.kernel.org" CC: "marcel@holtmann.org" , "luiz.dentz@gmail.com" , "gregkh@linuxfoundation.org" , "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: [PATCH v4] Bluetooth: hci_event: move wake reason storage into validated event handlers Thread-Topic: [PATCH v4] Bluetooth: hci_event: move wake reason storage into validated event handlers Thread-Index: AQHcvS2nfkQGIg1FOEayhp9F20qKgw== Date: Thu, 26 Mar 2026 14:34:30 +0000 Message-ID: Accept-Language: ru-RU, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=1seal.org; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PA4PR04MB7679:EE_|FRRPR04MB12596:EE_ x-ms-office365-filtering-correlation-id: 665c4a86-c640-43c0-36cf-08de8b44ca40 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|376014|366016|1800799024|38070700021|7055299006|18002099003|56012099003; x-microsoft-antispam-message-info: M+DEU7Km0ukfawFJHMLKxlHxiejhAClXNGmhZyB+U2KiCexcjMl7W8FxgIHQ0IfChBhjSC1YI/lYtIreHAaZkYV/nv73MKCKcPtPWnfcO+IyA09shabuPEw687ueIqPuVejoEb66zSTnBFeLpD0k+ZTIX4KEajtnlt0L4gmzKuqXKNS/gt4II587U/B0zV0LENp8HN4+CGUuaIkJWo6o8yt8FkttEUsswwDSD0GpuMG5awBijGUIvvugXXI9UHEsMmixBfjBJpcDAR7pfCz1a8ABgaaMMYg6ADmPQNEHm+qsDSBanSSnIuYMY4QmvWNW+61igXGFmQbo62QsC0wwBKa3zZMshz1yszlnFi0/r6nwRE3fMNibr0nOMrgQQ1KYPCPZhbTZGtDfqwIOctxtHRnJa3AKDs8KsfexkmpWnqc6SnW4Hyr7QvwDxnqQDa5Jfq60Yk6kpEmnXns6X4u+mV4YLfGVrFNFppnoQrFLcblw9MXoQ7OTng5uQoV1awAcz5atYBlYCGO05GXG2DipyNJvoFQqcNtYVcRvjPCZD1i8izsTEA6KfxcLqflZ3qq2AHKDBhKKObK23J4OrxYEPrG2dpVyksPfwElvoWvTmrIcOjdtg1o5e2Y+7zvR5Co83PKfh8a2UfMoOlIOZ1/WiRk2yBrxtODPf6lEoLERjKrWu3O8h9zDCZKgKLJWNZJyOeDK4lr95u1L5P2CFIRTsRl2zrK3sEG/clDAfhIDmvPJdYYvqQG6HL7CD/M4mkUM8d8HU9XzZ4HS+OMCrTfDSs/fDKa6BQ1qTdxgwp/odBmGhlcn0bx618tQlsqGcRy+ x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR04MB7679.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(1800799024)(38070700021)(7055299006)(18002099003)(56012099003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?K0RHQTVoUVVrdWxoZVluWndLazdnRExKUnNQcWhORXlROWVxVzVEY1htQktZ?= =?utf-8?B?bkU3QTNrU2s0aE9NNUZ5ZVZwYW8ydTZPTUVlWlhFVnYxNml5YjZjekFjaFA0?= =?utf-8?B?T1pHdlpCSjRhK1AraWl2UFVobTdmSDZLT3VPdUZ6U3g2Snc4RkNvYlZUWnBl?= =?utf-8?B?emgyOU5RaFo4K1ZKUjJWeVdVcnpPTXNaM1QzcGVNRzhXQ3lQd1N3aUFJRTZL?= =?utf-8?B?Y3BXRTN0R3F0eFVYWlhKbDlCV2F5ejdGR0lOaURwY1NESzMvS0QyQVZlazdt?= =?utf-8?B?akxoMWxuTUw5NExWeGlNVWI1ZnZHQzZJdHJqSkpXTGd0Mkc4b0Vod3l1cHoy?= =?utf-8?B?T1dVbDJiL2pVNnZNaXgzSzRRWFhxSmhsUVNsd1g4dkFMeW85QkNDT1ZZWFln?= =?utf-8?B?Zmgrd1ZFNnVxcEhqWmx0dXVjVGhFRFBubGxHMFFIWnkvZ3A2OS9iRmVJVkJV?= =?utf-8?B?NzhhUGlObFIrVExEOWpSZGN0WnV5RjVYSGlENjY4WHRXQitneUJMQnhaWGUv?= =?utf-8?B?UXJDcDhYQ1B0QWNrWnNRaE01OE4vRDhqcE9OTko4RXZZL3k3ZzBXdjhzc0R3?= =?utf-8?B?YStqTDd2T21DKzhDZ0wvc21uMHAwNys0Ujc2Sk1SNWVPdlFUaFY5Q0hSa2dU?= =?utf-8?B?ODZmUkgyb24rY1lHQzdyT3dVSExCL2pLNXVwcGxaSHIwYUxaOFRRNFo0VDFp?= =?utf-8?B?QWtKQ3pyTXdNWFB0OGNXTGFackZoZ3Q1Tng2bVNPKy9vR0pmcWc0WWhaSVdw?= =?utf-8?B?b0U2NlZsTGYwMG1iOG9PSFlTa2xKQW5NSjJSN1FES2NGM29JZ0NtUmdlcXdE?= =?utf-8?B?OGVvQ050ZXV6NE9UWkZudnQva3VqNWNjcTJRZjJJUTJSVG9qY3MrUUpiUEZ5?= =?utf-8?B?YXZsMTRlWFI3L1RtYlVpSlJLN0JaYXoyWS9ScGVxenZaUmdsVEpUazNIY3Fw?= =?utf-8?B?VmtKL3VmNHgza3BNd3hmUGkybmlISDJvcFBuTG1tVEw5RGR1eXRwVnl4c0dG?= =?utf-8?B?clBHNnppaEpsM2tpcmZwcjhvengrRDJFRllKTXBKTVRUaklLaXFaVG5uR01w?= =?utf-8?B?ckxnQWtVWlNYTXNYK1FMOG5vTWFxSlZ0MWh1TXN6QTlIYWdJbnViblJnd21B?= =?utf-8?B?bE5heDlRbjlFRjZ3WHduYjhESjJJSmxuaURDU0l4NG9UM3ovR0gva1ErZnB0?= =?utf-8?B?YUxrbHIwUWx6NE9rYTgvK3A3RWNabVJRaWY5bEY2ZUtRNjVIeHE1dE42V0ZW?= =?utf-8?B?d2NmdVdsRlp4ZFhYVUE0Zi81OU9Xb2x5b1FpRmpwbW5LTFlhZlhlVDZpYjBT?= =?utf-8?B?bGhjaXhGbHJvdHg3VndhTkpCY2ZuR3F5Sk9MUUtVY1V1SkwzWVhTbmVBRTdq?= =?utf-8?B?aWlJeEkxV2xXR0wvQkVROVBPdm1XdURZMlB1R0ExdmVMb25nR3JGWExjYlBz?= =?utf-8?B?ZGlMd0ZHZUFoZUZkREZNUjNodHEyUHREMXNWRm0rd0czTmN6Mm04a3k2RlNI?= =?utf-8?B?eXpkUFFWMUp6bkJKSHMrTUhHUEN5Y0l2ZTNXMnVBd3d1RklTRzM3SlErV3Ru?= =?utf-8?B?a284TktuQmlqd0V4eWRwd3hFVGlvRjRNYXhRdTJ2ektpKzJQeHZmUlFURnZt?= =?utf-8?B?aU9YcndncmljM0pCZUJpeDAzRHN2NU9yMVpQK0V0SGlXNHR6TTgwR2hWQU1p?= =?utf-8?B?Z2pHZTMyYXhYRXdjU2IwRkpmbVZONEpUYzFwSjlFSENhOEMrS0Jzdjcvd1gy?= =?utf-8?B?RGZxRWlGRzNiaWtDNjN4bk4vb25vaTZVcmY1bmx6ZHJ1SXZkR3RKNUwydS9S?= =?utf-8?B?SWx0NlJ5NUNQT1FPcTBRVEtEelNtVzJwQkFtWERRcmZDQkoyNlZpY2dGS2VW?= =?utf-8?B?UXlrMUhMWWJFMWdKNUIzcFRSdmgxYUdJVnE3ZDB1LyttYmw2VVZiUUVUYXQx?= =?utf-8?B?SllmRmVGZi9DcEVGbDRrN0J3NUdiVlpQWlpKWFNDWE8yOWZlWkt5bnVVV25G?= =?utf-8?B?aVFkWS8vSEJMSXRSTExvNVVFODE1b2dLcElRZzEyZmkycjgvVGhza2ZXSjMr?= =?utf-8?B?OGpNeUtrRmNCbkt6NVhQdmFFRVFGNUw4THZUMlRGaWZZUjZjUWpVVVYvaVBM?= =?utf-8?B?N2FGZDZOSnk3UWg0aXF5d01RWGQwVHhuQ3dZSDQ1L2pvWE9ITHo5cmdDWXFL?= =?utf-8?B?Ni9WTnEwUUoxSTluWnBhWW1zTVQvVEFCUThrOUY1SGdvYXhEYWdTZmNxR0Za?= =?utf-8?B?WVdKbFczYWVOMkxGL1FIWjJnTW5QUXFUMVRlREQ0UlBRdXAvRUl5aDV4elF0?= =?utf-8?Q?1JfqF4ouDwSuqiON5y?= Content-Type: text/plain; charset="utf-8" Content-ID: <1E353630FC43B14DB0B9FE72A056F72A@eurprd04.prod.outlook.com> Content-Transfer-Encoding: quoted-printable Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-OriginatorOrg: 1seal.org X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PA4PR04MB7679.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 665c4a86-c640-43c0-36cf-08de8b44ca40 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Mar 2026 14:34:30.0182 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: e701d992-0f02-433e-a019-4256abe96ea1 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: EqDZgAvJp4M7i6GpIcVRRLMyz3MCWBh+NGsw7xezbUobgd/67msFzmkYsSHLNQUooiovmgXW6uE87uR/xjbhXg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: FRRPR04MB12596 hci_store_wake_reason() is called from hci_event_packet() immediately after stripping the HCI event header but before hci_event_func() enforces the per-event minimum payload length from hci_ev_table. This means a short HCI event frame can reach bacpy() before any bounds check runs. Rather than duplicating skb parsing and per-event length checks inside hci_store_wake_reason(), move wake-address storage into the individual event handlers after their existing event-length validation has succeeded. Convert hci_store_wake_reason() into a small helper that only stores an already-validated bdaddr while the caller holds hci_dev_lock(). Use the same helper after hci_event_func() with a NULL address to preserve the existing unexpected-wake fallback semantics when no validated event handler records a wake address. Call the helper from hci_conn_request_evt(), hci_conn_complete_evt(), hci_le_adv_report_evt(), hci_le_ext_adv_report_evt(), and hci_le_direct_adv_report_evt(). Fixes: 2f20216c1d6f ("Bluetooth: Emit controller suspend and resume events") Cc: stable@vger.kernel.org Signed-off-by: Oleh Konko --- v4: - resend with proper inline patch formatting for CI; no code changes v3: - route the unexpected-wake fallback through hci_store_wake_reason(NULL, 0) after hci_event_func(), as suggested in review net/bluetooth/hci_event.c | 89 +++++++++++++-------------------------- 1 file changed, 29 insertions(+), 60 deletions(-) diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 286529d2e..c0e0b4a1c 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -80,6 +80,9 @@ static void *hci_le_ev_skb_pull(struct hci_dev *hdev, str= uct sk_buff *skb, return data; } =20 +static void hci_store_wake_reason(struct hci_dev *hdev, + const bdaddr_t *bdaddr, u8 addr_type); + static u8 hci_cc_inquiry_cancel(struct hci_dev *hdev, void *data, struct sk_buff *skb) { @@ -3111,6 +3114,7 @@ static void hci_conn_complete_evt(struct hci_dev *hde= v, void *data, bt_dev_dbg(hdev, "status 0x%2.2x", status); =20 hci_dev_lock(hdev); + hci_store_wake_reason(hdev, &ev->bdaddr, BDADDR_BREDR); =20 /* Check for existing connection: * @@ -3274,6 +3278,10 @@ static void hci_conn_request_evt(struct hci_dev *hde= v, void *data, =20 bt_dev_dbg(hdev, "bdaddr %pMR type 0x%x", &ev->bdaddr, ev->link_type); =20 + hci_dev_lock(hdev); + hci_store_wake_reason(hdev, &ev->bdaddr, BDADDR_BREDR); + hci_dev_unlock(hdev); + /* Reject incoming connection from device with same BD ADDR against * CVE-2020-26555 */ @@ -6403,6 +6411,8 @@ static void hci_le_adv_report_evt(struct hci_dev *hde= v, void *data, info->length + 1)) break; =20 + hci_store_wake_reason(hdev, &info->bdaddr, info->bdaddr_type); + if (info->length <=3D max_adv_len(hdev)) { rssi =3D info->data[info->length]; process_adv_report(hdev, info->type, &info->bdaddr, @@ -6491,6 +6501,8 @@ static void hci_le_ext_adv_report_evt(struct hci_dev = *hdev, void *data, info->length)) break; =20 + hci_store_wake_reason(hdev, &info->bdaddr, info->bdaddr_type); + evt_type =3D __le16_to_cpu(info->type) & LE_EXT_ADV_EVT_TYPE_MASK; legacy_evt_type =3D ext_evt_type_to_legacy(hdev, evt_type); =20 @@ -6834,6 +6846,8 @@ static void hci_le_direct_adv_report_evt(struct hci_d= ev *hdev, void *data, for (i =3D 0; i < ev->num; i++) { struct hci_ev_le_direct_adv_info *info =3D &ev->info[i]; =20 + hci_store_wake_reason(hdev, &info->bdaddr, info->bdaddr_type); + process_adv_report(hdev, info->type, &info->bdaddr, info->bdaddr_type, &info->direct_addr, info->direct_addr_type, HCI_ADV_PHY_1M, 0, @@ -7517,73 +7531,27 @@ static bool hci_get_cmd_complete(struct hci_dev *hd= ev, u16 opcode, return true; } =20 -static void hci_store_wake_reason(struct hci_dev *hdev, u8 event, - struct sk_buff *skb) +/* hdev lock must be held. pass NULL bdaddr to record an unexpected wake. = */ +static void hci_store_wake_reason(struct hci_dev *hdev, + const bdaddr_t *bdaddr, u8 addr_type) { - struct hci_ev_le_advertising_info *adv; - struct hci_ev_le_direct_adv_info *direct_adv; - struct hci_ev_le_ext_adv_info *ext_adv; - const struct hci_ev_conn_complete *conn_complete =3D (void *)skb->data; - const struct hci_ev_conn_request *conn_request =3D (void *)skb->data; - - hci_dev_lock(hdev); - /* If we are currently suspended and this is the first BT event seen, * save the wake reason associated with the event. */ if (!hdev->suspended || hdev->wake_reason) - goto unlock; + return; + + if (!bdaddr) { + hdev->wake_reason =3D MGMT_WAKE_REASON_UNEXPECTED; + return; + } =20 /* Default to remote wake. Values for wake_reason are documented in the * Bluez mgmt api docs. */ hdev->wake_reason =3D MGMT_WAKE_REASON_REMOTE_WAKE; - - /* Once configured for remote wakeup, we should only wake up for - * reconnections. It's useful to see which device is waking us up so - * keep track of the bdaddr of the connection event that woke us up. - */ - if (event =3D=3D HCI_EV_CONN_REQUEST) { - bacpy(&hdev->wake_addr, &conn_request->bdaddr); - hdev->wake_addr_type =3D BDADDR_BREDR; - } else if (event =3D=3D HCI_EV_CONN_COMPLETE) { - bacpy(&hdev->wake_addr, &conn_complete->bdaddr); - hdev->wake_addr_type =3D BDADDR_BREDR; - } else if (event =3D=3D HCI_EV_LE_META) { - struct hci_ev_le_meta *le_ev =3D (void *)skb->data; - u8 subevent =3D le_ev->subevent; - u8 *ptr =3D &skb->data[sizeof(*le_ev)]; - u8 num_reports =3D *ptr; - - if ((subevent =3D=3D HCI_EV_LE_ADVERTISING_REPORT || - subevent =3D=3D HCI_EV_LE_DIRECT_ADV_REPORT || - subevent =3D=3D HCI_EV_LE_EXT_ADV_REPORT) && - num_reports) { - adv =3D (void *)(ptr + 1); - direct_adv =3D (void *)(ptr + 1); - ext_adv =3D (void *)(ptr + 1); - - switch (subevent) { - case HCI_EV_LE_ADVERTISING_REPORT: - bacpy(&hdev->wake_addr, &adv->bdaddr); - hdev->wake_addr_type =3D adv->bdaddr_type; - break; - case HCI_EV_LE_DIRECT_ADV_REPORT: - bacpy(&hdev->wake_addr, &direct_adv->bdaddr); - hdev->wake_addr_type =3D direct_adv->bdaddr_type; - break; - case HCI_EV_LE_EXT_ADV_REPORT: - bacpy(&hdev->wake_addr, &ext_adv->bdaddr); - hdev->wake_addr_type =3D ext_adv->bdaddr_type; - break; - } - } - } else { - hdev->wake_reason =3D MGMT_WAKE_REASON_UNEXPECTED; - } - -unlock: - hci_dev_unlock(hdev); + bacpy(&hdev->wake_addr, bdaddr); + hdev->wake_addr_type =3D addr_type; } =20 #define HCI_EV_VL(_op, _func, _min_len, _max_len) \ @@ -7830,14 +7798,15 @@ void hci_event_packet(struct hci_dev *hdev, struct = sk_buff *skb) =20 skb_pull(skb, HCI_EVENT_HDR_SIZE); =20 - /* Store wake reason if we're suspended */ - hci_store_wake_reason(hdev, event, skb); - bt_dev_dbg(hdev, "event 0x%2.2x", event); =20 hci_event_func(hdev, event, skb, &opcode, &status, &req_complete, &req_complete_skb); =20 + hci_dev_lock(hdev); + hci_store_wake_reason(hdev, NULL, 0); + hci_dev_unlock(hdev); + if (req_complete) { req_complete(hdev, status, opcode); } else if (req_complete_skb) { --=20 2.50.0