diff options
| author | Gustavo A. R. Silva <gustavo@embeddedor.com> | 2019-02-07 18:40:33 -0600 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2019-02-18 14:00:09 +0100 |
| commit | 16e183423f1a3aeb603d7648d2ca3a578d5a9941 (patch) | |
| tree | ee809543d41a072e865edfff98c839b357864e06 | |
| parent | 32a7b4cbe93b0a0ef7e63d31ca69ce54736c4412 (diff) | |
| download | linux-16e183423f1a3aeb603d7648d2ca3a578d5a9941.tar.gz linux-16e183423f1a3aeb603d7648d2ca3a578d5a9941.tar.bz2 linux-16e183423f1a3aeb603d7648d2ca3a578d5a9941.zip | |
Bluetooth: hci_event: Use struct_size() helper
Make use of the struct_size() helper instead of an open-coded version
in order to avoid any potential type mistakes, in particular in the
context in which this code is being used.
So, change the following form:
sizeof(*ev) + ev->num_hndl * sizeof(struct hci_comp_pkts_info)
to :
struct_size(ev, handles, ev->num_hndl)
This code was detected with the help of Coccinelle.
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| -rw-r--r-- | net/bluetooth/hci_event.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index ac2826ce162b..609fd6871c5a 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -3556,8 +3556,8 @@ static void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *skb) return; } - if (skb->len < sizeof(*ev) || skb->len < sizeof(*ev) + - ev->num_hndl * sizeof(struct hci_comp_pkts_info)) { + if (skb->len < sizeof(*ev) || + skb->len < struct_size(ev, handles, ev->num_hndl)) { BT_DBG("%s bad parameters", hdev->name); return; } @@ -3644,8 +3644,8 @@ static void hci_num_comp_blocks_evt(struct hci_dev *hdev, struct sk_buff *skb) return; } - if (skb->len < sizeof(*ev) || skb->len < sizeof(*ev) + - ev->num_hndl * sizeof(struct hci_comp_blocks_info)) { + if (skb->len < sizeof(*ev) || + skb->len < struct_size(ev, handles, ev->num_hndl)) { BT_DBG("%s bad parameters", hdev->name); return; } |