Re: [PATCH v2] Bluetooth: fix the erroneous flush_work() order

On Tue, Jun 08, 2021 at 06:53:17AM +0200, Salvatore Bonaccorso wrote:

Hi Greg,

On Thu, May 27, 2021 at 10:14:59PM +0200, Marcel Holtmann wrote:

quoted

Hi Greg,

quoted

In the cleanup routine for failed initialization of HCI device,
the flush_work(&hdev->rx_work) need to be finished before the
flush_work(&hdev->cmd_work). Otherwise, the hci_rx_work() can
possibly invoke new cmd_work and cause a bug, like double free,
in late processings.

This was assigned CVE-2021-3564.

This patch reorder the flush_work() to fix this bug.

Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Johan Hedberg <redacted>
Cc: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: linux-bluetooth@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Lin Ma <redacted>
Signed-off-by: Hao Xiong <redacted>
Cc: stable <redacted>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
net/bluetooth/hci_core.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

patch has been applied to bluetooth-stable tree.

Can you queue this one as well for the stable series? It is
6a137caec23aeb9e036cdfd8a46dd8a366460e5d commit upstream and in
5.13-rc5.

It's now queued up, thanks.

greg k-h