| Message ID | 1590697867-7618-1-git-send-email-zijuhu@codeaurora.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | feac90d756c03b03b83fabe83571bd88ecc96b78 |
| Headers | show |
| Series | [v2] bluetooth: hci_qca: Fix suspend/resume functionality failure | expand |
On Fri, May 29, 2020 at 04:31:07AM +0800, Zijun Hu wrote: > @dev parameter of qca_suspend()/qca_resume() represents > serdev_device, but it is mistook for hci_dev and causes > succedent unexpected memory access. > > Fix by taking @dev as serdev_device. > > Fixes: 41d5b25fed0 ("Bluetooth: hci_qca: add PM support") > Signed-off-by: Zijun Hu <zijuhu@codeaurora.org> Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Hi Zijun, > @dev parameter of qca_suspend()/qca_resume() represents > serdev_device, but it is mistook for hci_dev and causes > succedent unexpected memory access. > > Fix by taking @dev as serdev_device. > > Fixes: 41d5b25fed0 ("Bluetooth: hci_qca: add PM support") > Signed-off-by: Zijun Hu <zijuhu@codeaurora.org> > --- > Changes in v2: > - remove unused variable @hdev > > drivers/bluetooth/hci_qca.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) patch has been applied to bluetooth-next tree. Regards Marcel
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index e4a6823..adcbe00 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -1977,8 +1977,9 @@ static void qca_serdev_remove(struct serdev_device *serdev) static int __maybe_unused qca_suspend(struct device *dev) { - struct hci_dev *hdev = container_of(dev, struct hci_dev, dev); - struct hci_uart *hu = hci_get_drvdata(hdev); + struct serdev_device *serdev = to_serdev_device(dev); + struct qca_serdev *qcadev = serdev_device_get_drvdata(serdev); + struct hci_uart *hu = &qcadev->serdev_hu; struct qca_data *qca = hu->priv; unsigned long flags; int ret = 0; @@ -2057,8 +2058,9 @@ static int __maybe_unused qca_suspend(struct device *dev) static int __maybe_unused qca_resume(struct device *dev) { - struct hci_dev *hdev = container_of(dev, struct hci_dev, dev); - struct hci_uart *hu = hci_get_drvdata(hdev); + struct serdev_device *serdev = to_serdev_device(dev); + struct qca_serdev *qcadev = serdev_device_get_drvdata(serdev); + struct hci_uart *hu = &qcadev->serdev_hu; struct qca_data *qca = hu->priv; clear_bit(QCA_SUSPENDING, &qca->flags);
@dev parameter of qca_suspend()/qca_resume() represents serdev_device, but it is mistook for hci_dev and causes succedent unexpected memory access. Fix by taking @dev as serdev_device. Fixes: 41d5b25fed0 ("Bluetooth: hci_qca: add PM support") Signed-off-by: Zijun Hu <zijuhu@codeaurora.org> --- Changes in v2: - remove unused variable @hdev drivers/bluetooth/hci_qca.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)