summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Borg <martin.borg@enea.com>2018-10-11 16:35:55 +0200
committerGerrit Code Review <gerrit2@sestogerrit02>2018-10-11 16:35:55 +0200
commit6f22577823a2d818760a1ad9898963c467f85e96 (patch)
treee5488d58126d9ee8d329cc887a154486bff8d199
parent86063d95c238d81d55343db634866c5a5e7506af (diff)
parentfc12fa543f19be12b76f55f0a854351c1f030405 (diff)
downloadenea-kernel-cache-6f22577823a2d818760a1ad9898963c467f85e96.tar.gz
Merge "Revert "hidp: CVE-2018-9363"" into intel-4.9
-rw-r--r--patches/cve/4.9.x.scc11
-rw-r--r--patches/cve/CVE-2018-9363-Bluetooth-hidp-buffer-overflow-in-hidp_process_repor.patch53
2 files changed, 0 insertions, 64 deletions
diff --git a/patches/cve/4.9.x.scc b/patches/cve/4.9.x.scc
deleted file mode 100644
index a296f8e..0000000
--- a/patches/cve/4.9.x.scc
+++ /dev/null
@@ -1,11 +0,0 @@
1#CVEs fixed in 4.9.117:
2patch CVE-2018-14734-infiniband-fix-a-possible-use-after-free-bug.patch
3
4#CVEs fixed in 4.9.119:
5patch CVE-2018-12233-jfs-Fix-inconsistency-between-memory-allocation-and-.patch
6
7#CVEs fixed in 4.9.120:
8patch CVE-2018-15572-x86-speculation-Protect-against-userspace-userspace-.patch
9
10#CVEs fixed in 4.9.121:
11patch CVE-2018-9363-Bluetooth-hidp-buffer-overflow-in-hidp_process_repor.patch
diff --git a/patches/cve/CVE-2018-9363-Bluetooth-hidp-buffer-overflow-in-hidp_process_repor.patch b/patches/cve/CVE-2018-9363-Bluetooth-hidp-buffer-overflow-in-hidp_process_repor.patch
deleted file mode 100644
index 8ebf70f..0000000
--- a/patches/cve/CVE-2018-9363-Bluetooth-hidp-buffer-overflow-in-hidp_process_repor.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1From 7992c18810e568b95c869b227137a2215702a805 Mon Sep 17 00:00:00 2001
2From: Mark Salyzyn <salyzyn@android.com>
3Date: Tue, 31 Jul 2018 15:02:13 -0700
4Subject: [PATCH] Bluetooth: hidp: buffer overflow in hidp_process_report
5
6CVE-2018-9363
7
8The buffer length is unsigned at all layers, but gets cast to int and
9checked in hidp_process_report and can lead to a buffer overflow.
10Switch len parameter to unsigned int to resolve issue.
11
12This affects 3.18 and newer kernels.
13
14CVE: CVE-2018-9363
15Upstream-Status: Backport
16
17Signed-off-by: Mark Salyzyn <salyzyn@android.com>
18Fixes: a4b1b5877b514b276f0f31efe02388a9c2836728 ("HID: Bluetooth: hidp: make sure input buffers are big enough")
19Cc: Marcel Holtmann <marcel@holtmann.org>
20Cc: Johan Hedberg <johan.hedberg@gmail.com>
21Cc: "David S. Miller" <davem@davemloft.net>
22Cc: Kees Cook <keescook@chromium.org>
23Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
24Cc: linux-bluetooth@vger.kernel.org
25Cc: netdev@vger.kernel.org
26Cc: linux-kernel@vger.kernel.org
27Cc: security@kernel.org
28Cc: kernel-team@android.com
29Acked-by: Kees Cook <keescook@chromium.org>
30Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
31Signed-off-by: Andreas Wellving <andreas.wellving@enea.com>
32---
33 net/bluetooth/hidp/core.c | 4 ++--
34 1 file changed, 2 insertions(+), 2 deletions(-)
35
36diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
37index 6f3eaf2..253975c 100644
38--- a/net/bluetooth/hidp/core.c
39+++ b/net/bluetooth/hidp/core.c
40@@ -431,9 +431,8 @@ static void hidp_del_timer(struct hidp_session *session)
41 del_timer(&session->timer);
42 }
43
44-static void hidp_process_report(struct hidp_session *session,
45- int type, const u8 *data, int len, int intr)
46+static void hidp_process_report(struct hidp_session *session, int type,
47+ const u8 *data, unsigned int len, int intr)
48 {
49 if (len > HID_MAX_BUFFER_SIZE)
50 len = HID_MAX_BUFFER_SIZE;
51--
52
53