Hi Marcel,
On Tue, Apr 27, 2021 at 11:37 AM Marcel Holtmann <marcel@xxxxxxxxxxxx> wrote:
>
> Hi Luiz,
>
> >>>>> This uses skb_pull to check the BR/EDR events received have the minimum
> >>>>> required length.
> >>>>>
> >>>>> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
> >>>>> ---
> >>>>> include/net/bluetooth/hci.h | 4 +
> >>>>> net/bluetooth/hci_event.c | 272 +++++++++++++++++++++++++++++-------
> >>>>> 2 files changed, 229 insertions(+), 47 deletions(-)
> >>>>>
> >>>>> diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
> >>>>> index ea4ae551c426..f1f505355e81 100644
> >>>>> --- a/include/net/bluetooth/hci.h
> >>>>> +++ b/include/net/bluetooth/hci.h
> >>>>> @@ -1894,6 +1894,10 @@ struct hci_cp_le_reject_cis {
> >>>>> } __packed;
> >>>>>
> >>>>> /* ---- HCI Events ---- */
> >>>>> +struct hci_ev_status {
> >>>>> + __u8 status;
> >>>>> +} __packed;
> >>>>> +
> >>>>> #define HCI_EV_INQUIRY_COMPLETE 0x01
> >>>>>
> >>>>> #define HCI_EV_INQUIRY_RESULT 0x02
> >>>>> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
> >>>>> index 5e99968939ce..077541fcba41 100644
> >>>>> --- a/net/bluetooth/hci_event.c
> >>>>> +++ b/net/bluetooth/hci_event.c
> >>>>> @@ -42,6 +42,30 @@
> >>>>>
> >>>>> /* Handle HCI Event packets */
> >>>>>
> >>>>> +static void *hci_skb_pull(struct sk_buff *skb, size_t len)
> >>>>> +{
> >>>>> + void *data = skb->data;
> >>>>> +
> >>>>> + if (skb->len < len)
> >>>>> + return NULL;
> >>>>> +
> >>>>> + skb_pull(skb, len);
> >>>>> +
> >>>>> + return data;
> >>>>> +}
> >>>>> +
> >>>>> +static void *hci_ev_skb_pull(struct hci_dev *hdev, struct sk_buff *skb,
> >>>>> + u8 ev, size_t len)
> >>>>> +{
> >>>>> + void *data;
> >>>>> +
> >>>>> + data = hci_skb_pull(skb, len);
> >>>>> + if (!data)
> >>>>> + bt_dev_err(hdev, "Malformed Event: 0x%2.2x", ev);
> >>>>> +
> >>>>> + return data;
> >>>>> +}
> >>>>> +
> >>>>
> >>>> so if you do it in one function, this will look like this:
> >>>>
> >>>> static void *hci_ev_skb_pull(..)
> >>>> {
> >>>> void *data = skb->data;
> >>>>
> >>>> if (skb->len < len) {
> >>>> bt_dev_err(hdev, “Malformed ..”);
> >>>> return NULL;
> >>>> }
> >>>>
> >>>> skb_pull(skb, len);
> >>>> return data;
> >>>> }
> >>>>
> >>>> static void *hci_cc_skb_pull(..)
> >>>> {
> >>>> void *data = skb->data;
> >>>>
> >>>> if (skb->len < len) {
> >>>> bt_dev_err(..);
> >>>> return NULL;
> >>>> }
> >>>>
> >>>> skb_pull(..);
> >>>> return data;
> >>>> }
> >>>>
> >>>> I realize that you want to optimize the code with hci_skb_pull, but I don’t see how that makes it simpler or cleaner. In the end you just have spaghetti code and don’t win anything in size reduction or complexity.
> >>>
> >>> Right, I can either do that or perhaps bite the bullet and convert the
> >>> whole hci_event.c to use a function table:
> >>>
> >>> #define HCI_EVENT(_op, _len, _func)...
> >>>
> >>> struct hci_event {
> >>> __u8 op;
> >>> __u16 len;
> >>> func...
> >>> } ev_table[] = {
> >>> HCI_EVENT(...),
> >>> }
> >>>
> >>> But that would pack a lot more changes since we would need to convert
> >>> the whole switch to a for loop or alternatively if we don't want do a
> >>> lookup we could omit the op and access the table by index if we want
> >>> to trade speed over code size, with that we can have just one call to
> >>> the likes of hci_ev_skb_pull.
> >>
> >> looping through a table is not ideal. There are too many events that you can receive and if we end up looping for every LE advertising report it would be rather silly. And of course a static table is possible since event numbers are assigned in order, but it also means some sort of overhead since we don’t parse each event.
> >>
> >> In addition to that dilemma, you have the problem that not all events are fixed size. So you end up indicating that similar to how we do it in btmon which will increase the table size again. Maybe that is actually ok since two giant switch statements also take time and code size.
> >>
> >> So our currently max event code is 0x57 for Authenticated Payload Timeout and the max LE event code is 0x3e for BIG Info Advertising Report. Meaning table one would have 87 entries and table would have two 63 entries. If we do min_len,max_len as uint8 then we have 2 octets and a function pointer. Maybe that is not too bad since that is all static const data.
> >
> > Yep, even if we have to have NOP for those event we don't handle I
> > don't think it is such a big deal and accessing by index should be
> > comparable in terms of speed to a switch statement, that said we may
> > still need to do some checks on the callbacks for those events that
> > have variable size I was only intending to do minimal size checks but
> > perhaps you are saying it might be better to have a bool/flag saying
> > that the event has variable size which matters when we are checking
> > the length to either use == or <.
>
> I actually meant min_len + max_len.
>
> So you have for example
>
> HCI_EVENT(..) that sets min_len = x, max_len = x.
> HCI_EVENT_VAR(..) that sets min_len = x and max_len = 253.
>
> No need for extra flags then.
Ah got it, is there really a max_len for variable size though? Or you
mean to say that should be limited to event buffer size? That Im
afraid we only discover at runtime, anyway usually for variable size
we should be using flex_array_size but that requires accessing the
received skb so we can't really tell at build time and it will be
likely left for the callback to figure out it has received enough data
or not.
>
> Regards
>
> Marcel
>
--
Luiz Augusto von Dentz
