diff options
| author |   Johan Hedberg <johan.hedberg@intel.com> | 2012-03-26 14:21:41 +0300 |
|---|---|---|
| committer |   Gustavo Padovan <gustavo@padovan.org> | 2012-03-28 12:02:40 -0300 |
| commit | 84d9d0716b2d5f4a27de4801bd2dbf7aff5e1c38 (patch) | |
| tree | 904a091f877be933498eed2bfbf056f404c3b61a /include/net/bluetooth/hci_core.h | |
| parent | Bluetooth: Fix memory leaks due to chan refcnt (diff) | |
| download | linux-dev-84d9d0716b2d5f4a27de4801bd2dbf7aff5e1c38.tar.xz linux-dev-84d9d0716b2d5f4a27de4801bd2dbf7aff5e1c38.zip | |
Bluetooth: Don't increment twice in eir_has_data_type()
The parsed variable is already incremented inside the for-loop so there
no need to increment it again (not to mention that the code was
incrementing it the wrong amount).
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo@padovan.org>
Diffstat (limited to 'include/net/bluetooth/hci_core.h')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 8e103281a09b..220d8e0a75fb 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -907,11 +907,10 @@ static inline void hci_role_switch_cfm(struct hci_conn *conn, __u8 status, static inline bool eir_has_data_type(u8 *data, size_t data_len, u8 type) { - u8 field_len; - size_t parsed; + size_t parsed = 0; - for (parsed = 0; parsed < data_len - 1; parsed += field_len) { - field_len = data[0]; + while (parsed < data_len - 1) { + u8 field_len = data[0]; if (field_len == 0) break; |