[SRU][Trusty][Bionic][PATCH 1/1] Bluetooth: hidp: buffer overflow in hidp_process_report

[Kleber Sacilotto de Souza]

From: Mark Salyzyn <salyzyn at android.com>

CVE-2018-9363

The buffer length is unsigned at all layers, but gets cast to int and
checked in hidp_process_report and can lead to a buffer overflow.
Switch len parameter to unsigned int to resolve issue.

This affects 3.18 and newer kernels.

Signed-off-by: Mark Salyzyn <salyzyn at android.com>
Fixes: a4b1b5877b514b276f0f31efe02388a9c2836728 ("HID: Bluetooth: hidp: make sure input buffers are big enough")
Cc: Marcel Holtmann <marcel at holtmann.org>
Cc: Johan Hedberg <johan.hedberg at gmail.com>
Cc: "David S. Miller" <davem at davemloft.net>
Cc: Kees Cook <keescook at chromium.org>
Cc: Benjamin Tissoires <benjamin.tissoires at redhat.com>
Cc: linux-bluetooth at vger.kernel.org
Cc: netdev at vger.kernel.org
Cc: linux-kernel at vger.kernel.org
Cc: security at kernel.org
Cc: kernel-team at android.com
Acked-by: Kees Cook <keescook at chromium.org>
Signed-off-by: Marcel Holtmann <marcel at holtmann.org>

(cherry picked from commit 7992c18810e568b95c869b227137a2215702a805)
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza at canonical.com>
---
 net/bluetooth/hidp/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index f2cec70d520c..c3b23ab2b723 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -431,8 +431,8 @@ static void hidp_del_timer(struct hidp_session *session)
 		del_timer(&session->timer);
 }
 
-static void hidp_process_report(struct hidp_session *session,
-				int type, const u8 *data, int len, int intr)
+static void hidp_process_report(struct hidp_session *session, int type,
+				const u8 *data, unsigned int len, int intr)
 {
 	if (len > HID_MAX_BUFFER_SIZE)
 		len = HID_MAX_BUFFER_SIZE;
-- 
2.17.1