Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230630143125.1.I3b7c8905728f3124576361ca35ed28e37f12f5d1@changeid>
In-Reply-To: <20230630143125.1.I3b7c8905728f3124576361ca35ed28e37f12f5d1@changeid>
From:   Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Date:   Fri, 30 Jun 2023 14:54:46 -0700
Message-ID: <CABBYNZLtxMGQLFwZTztPo2epV2E9Z4uthFMeozxABW2KXQR1nQ@mail.gmail.com>
Subject: Re: [PATCH] Bluetooth: hci_sync: Avoid use-after-free in dbg for hci_remove_adv_monitor()
To:     Douglas Anderson <dianders@chromium.org>
Cc:     Marcel Holtmann <marcel@holtmann.org>,
        Johan Hedberg <johan.hedberg@gmail.com>,
        Stephen Boyd <swboyd@chromium.org>,
        Manish Mandlik <mmandlik@google.com>,
        Miao-chen Chou <mcchou@google.com>,
        linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Hi Douglas,

On Fri, Jun 30, 2023 at 2:40=E2=80=AFPM Douglas Anderson <dianders@chromium=
.org> wrote:
>
> KASAN reports that there's a use-after-free in
> hci_remove_adv_monitor(). Trawling through the disassembly, you can
> see that the complaint is from the access in bt_dev_dbg() under the
> HCI_ADV_MONITOR_EXT_MSFT case. The problem case happens because
> msft_remove_monitor() can end up freeing the monitor
> structure. Specifically:
>   hci_remove_adv_monitor() ->
>   msft_remove_monitor() ->
>   msft_remove_monitor_sync() ->
>   msft_le_cancel_monitor_advertisement_cb() ->
>   hci_free_adv_monitor()
>
> Let's fix the problem by just stashing the relevant data when it's
> still valid.
>
> Fixes: 7cf5c2978f23 ("Bluetooth: hci_sync: Refactor remove Adv Monitor")
> Signed-off-by: Douglas Anderson <dianders@chromium.org>
> ---
>
>  net/bluetooth/hci_core.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
> index 48917c68358d..dbb2043a9112 100644
> --- a/net/bluetooth/hci_core.c
> +++ b/net/bluetooth/hci_core.c
> @@ -1972,6 +1972,7 @@ static int hci_remove_adv_monitor(struct hci_dev *h=
dev,
>                                   struct adv_monitor *monitor)
>  {
>         int status =3D 0;
> +       int handle;
>
>         switch (hci_get_adv_monitor_offload_ext(hdev)) {
>         case HCI_ADV_MONITOR_EXT_NONE: /* also goes here when powered off=
 */
> @@ -1980,9 +1981,10 @@ static int hci_remove_adv_monitor(struct hci_dev *=
hdev,
>                 goto free_monitor;
>
>         case HCI_ADV_MONITOR_EXT_MSFT:
> +               handle =3D monitor->handle;
>                 status =3D msft_remove_monitor(hdev, monitor);
>                 bt_dev_dbg(hdev, "%s remove monitor %d msft status %d",
> -                          hdev->name, monitor->handle, status);
> +                          hdev->name, handle, status);

Just move the call to bt_dev_dbg under msft_remove_monitor, also there
is no reason to print hdev->name since bt_dev_dbg already does that so
while at it we can probably fix this as well.

>                 break;
>         }
>
> --
> 2.41.0.255.g8b1d071c50-goog
>


--=20
Luiz Augusto von Dentz