summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoic Poulain <loic.poulain@intel.com>2014-08-08 19:07:16 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-30 09:38:23 -0700
commit93d192a930c7b5bd97f1f77f90d298703896fdd3 (patch)
treeaf3782ba4eefcb9098c9926362ce8f6e8b196571
parentc24580ec5132545788c48249f9d8fab758ee908c (diff)
downloadlinux-stable-93d192a930c7b5bd97f1f77f90d298703896fdd3.tar.gz
linux-stable-93d192a930c7b5bd97f1f77f90d298703896fdd3.tar.bz2
linux-stable-93d192a930c7b5bd97f1f77f90d298703896fdd3.zip
Bluetooth: Fix HCI H5 corrupted ack value
commit 4807b51895dce8aa650ebebc51fa4a795ed6b8b8 upstream. In this expression: seq = (seq - 1) % 8 seq (u8) is implicitly converted to an int in the arithmetic operation. So if seq value is 0, operation is ((0 - 1) % 8) => (-1 % 8) => -1. The new seq value is 0xff which is an invalid ACK value, we expect 0x07. It leads to frequent dropped ACK and retransmission. Fix this by using '&' binary operator instead of '%'. Signed-off-by: Loic Poulain <loic.poulain@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/bluetooth/hci_h5.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
index e36a0245f2c1..56519927479f 100644
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -237,7 +237,7 @@ static void h5_pkt_cull(struct h5 *h5)
break;
to_remove--;
- seq = (seq - 1) % 8;
+ seq = (seq - 1) & 0x07;
}
if (seq != h5->rx_ack)