Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20220121173622.192744-1-soenke.huster@eknoes.de> <4f3d6dcf-c142-9a99-df97-6190c8f2abc9@eknoes.de>
In-Reply-To: <4f3d6dcf-c142-9a99-df97-6190c8f2abc9@eknoes.de>
From:   Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Date:   Fri, 21 Jan 2022 13:31:25 -0800
Message-ID: <CABBYNZ+VQ3Gfw0n=PavFhnnOy2=+1OAeV5UT_S25Lz_4gWzWEQ@mail.gmail.com>
Subject: Re: [RFC PATCH] Bluetooth: hci_event: Ignore multiple conn complete events
To:     =?UTF-8?Q?S=C3=B6nke_Huster?= <soenke.huster@eknoes.de>
Cc:     Marcel Holtmann <marcel@holtmann.org>,
        Johan Hedberg <johan.hedberg@gmail.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        "linux-bluetooth@vger.kernel.org" <linux-bluetooth@vger.kernel.org>,
        "open list:NETWORKING [GENERAL]" <netdev@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Hi S=C3=B6nke,

On Fri, Jan 21, 2022 at 10:22 AM S=C3=B6nke Huster <soenke.huster@eknoes.de=
> wrote:
>
> I just noticed that just checking for handle does not work, as obviously =
0x0 could also be a handle value and therefore it can't be distinguished, w=
hether it is not set yet or it is 0x0.

Yep, we should probably check its state, check for state !=3D BT_OPEN
since that is what hci_conn_add initialize the state.

> On 21.01.22 18:36, Soenke Huster wrote:
> > When a HCI_CONNECTION_COMPLETE event is received multiple times
> > for the same handle, the device is registered multiple times which lead=
s
> > to memory corruptions. Therefore, consequent events for a single
> > connection are ignored.
> >
> > The conn->state can hold different values so conn->handle is
> > checked to detect whether a connection is already set up.
> >
> > Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=3D215497
> > Signed-off-by: Soenke Huster <soenke.huster@eknoes.de>
> > ---
> > This fixes the referenced bug and several use-after-free issues I disco=
vered.
> > I tagged it as RFC, as I am not 100% sure if checking the existence of =
the
> > handle is the correct approach, but to the best of my knowledge it must=
 be
> > set for the first time in this function for valid connections of this e=
vent,
> > therefore it should be fine.
> >
> > net/bluetooth/hci_event.c | 11 +++++++++++
> >  1 file changed, 11 insertions(+)
> >
> > diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
> > index 681c623aa380..71ccb12c928d 100644
> > --- a/net/bluetooth/hci_event.c
> > +++ b/net/bluetooth/hci_event.c
> > @@ -3106,6 +3106,17 @@ static void hci_conn_complete_evt(struct hci_dev=
 *hdev, void *data,
> >               }
> >       }
> >
> > +     /* The HCI_Connection_Complete event is only sent once per connec=
tion.
> > +      * Processing it more than once per connection can corrupt kernel=
 memory.
> > +      *
> > +      * As the connection handle is set here for the first time, it in=
dicates
> > +      * whether the connection is already set up.
> > +      */
> > +     if (conn->handle) {
> > +             bt_dev_err(hdev, "Ignoring HCI_Connection_Complete for ex=
isting connection");
> > +             goto unlock;
> > +     }
> > +
> >       if (!ev->status) {
> >               conn->handle =3D __le16_to_cpu(ev->handle);
> >


--=20
Luiz Augusto von Dentz