| From 1c58e933aba23f68c0d3f192f7cc6eed8fabd694 Mon Sep 17 00:00:00 2001 |
| From: Szymon Janc <szymon.janc@codecoup.pl> |
| Date: Tue, 18 May 2021 16:54:36 +0200 |
| Subject: Bluetooth: Remove spurious error message |
| |
| From: Szymon Janc <szymon.janc@codecoup.pl> |
| |
| commit 1c58e933aba23f68c0d3f192f7cc6eed8fabd694 upstream. |
| |
| Even with rate limited reporting this is very spammy and since |
| it is remote device that is providing bogus data there is no |
| need to report this as error. |
| |
| Since real_len variable was used only to allow conditional error |
| message it is now also removed. |
| |
| [72454.143336] bt_err_ratelimited: 10 callbacks suppressed |
| [72454.143337] Bluetooth: hci0: advertising data len corrected |
| [72454.296314] Bluetooth: hci0: advertising data len corrected |
| [72454.892329] Bluetooth: hci0: advertising data len corrected |
| [72455.051319] Bluetooth: hci0: advertising data len corrected |
| [72455.357326] Bluetooth: hci0: advertising data len corrected |
| [72455.663295] Bluetooth: hci0: advertising data len corrected |
| [72455.787278] Bluetooth: hci0: advertising data len corrected |
| [72455.942278] Bluetooth: hci0: advertising data len corrected |
| [72456.094276] Bluetooth: hci0: advertising data len corrected |
| [72456.249137] Bluetooth: hci0: advertising data len corrected |
| [72459.416333] bt_err_ratelimited: 13 callbacks suppressed |
| [72459.416334] Bluetooth: hci0: advertising data len corrected |
| [72459.721334] Bluetooth: hci0: advertising data len corrected |
| [72460.011317] Bluetooth: hci0: advertising data len corrected |
| [72460.327171] Bluetooth: hci0: advertising data len corrected |
| [72460.638294] Bluetooth: hci0: advertising data len corrected |
| [72460.946350] Bluetooth: hci0: advertising data len corrected |
| [72461.225320] Bluetooth: hci0: advertising data len corrected |
| [72461.690322] Bluetooth: hci0: advertising data len corrected |
| [72462.118318] Bluetooth: hci0: advertising data len corrected |
| [72462.427319] Bluetooth: hci0: advertising data len corrected |
| [72464.546319] bt_err_ratelimited: 7 callbacks suppressed |
| [72464.546319] Bluetooth: hci0: advertising data len corrected |
| [72464.857318] Bluetooth: hci0: advertising data len corrected |
| [72465.163332] Bluetooth: hci0: advertising data len corrected |
| [72465.278331] Bluetooth: hci0: advertising data len corrected |
| [72465.432323] Bluetooth: hci0: advertising data len corrected |
| [72465.891334] Bluetooth: hci0: advertising data len corrected |
| [72466.045334] Bluetooth: hci0: advertising data len corrected |
| [72466.197321] Bluetooth: hci0: advertising data len corrected |
| [72466.340318] Bluetooth: hci0: advertising data len corrected |
| [72466.498335] Bluetooth: hci0: advertising data len corrected |
| [72469.803299] bt_err_ratelimited: 10 callbacks suppressed |
| |
| Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl> |
| Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=203753 |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Marcel Holtmann <marcel@holtmann.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| net/bluetooth/hci_event.c | 14 +++++--------- |
| 1 file changed, 5 insertions(+), 9 deletions(-) |
| |
| --- a/net/bluetooth/hci_event.c |
| +++ b/net/bluetooth/hci_event.c |
| @@ -5401,7 +5401,7 @@ static void process_adv_report(struct hc |
| struct hci_conn *conn; |
| bool match; |
| u32 flags; |
| - u8 *ptr, real_len; |
| + u8 *ptr; |
| |
| switch (type) { |
| case LE_ADV_IND: |
| @@ -5432,14 +5432,10 @@ static void process_adv_report(struct hc |
| break; |
| } |
| |
| - real_len = ptr - data; |
| - |
| - /* Adjust for actual length */ |
| - if (len != real_len) { |
| - bt_dev_err_ratelimited(hdev, "advertising data len corrected %u -> %u", |
| - len, real_len); |
| - len = real_len; |
| - } |
| + /* Adjust for actual length. This handles the case when remote |
| + * device is advertising with incorrect data length. |
| + */ |
| + len = ptr - data; |
| |
| /* If the direct address is present, then this report is from |
| * a LE Direct Advertising Report event. In that case it is |
