3.18-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Mark Salyzyn <saly...@android.com>

commit 7992c18810e568b95c869b227137a2215702a805 upstream.

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 <saly...@android.com>
Fixes: a4b1b5877b514b276f0f31efe02388a9c2836728 ("HID: Bluetooth: hidp: make 
sure input buffers are big enough")
Cc: Marcel Holtmann <mar...@holtmann.org>
Cc: Johan Hedberg <johan.hedb...@gmail.com>
Cc: "David S. Miller" <da...@davemloft.net>
Cc: Kees Cook <keesc...@chromium.org>
Cc: Benjamin Tissoires <benjamin.tissoi...@redhat.com>
Cc: linux-blueto...@vger.kernel.org
Cc: net...@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: secur...@kernel.org
Cc: kernel-t...@android.com
Acked-by: Kees Cook <keesc...@chromium.org>
Signed-off-by: Marcel Holtmann <mar...@holtmann.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 net/bluetooth/hidp/core.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -416,8 +416,8 @@ static void hidp_del_timer(struct hidp_s
                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;


Reply via email to