diff options
author | Marc Ferland <ferlandm@amotus.ca> | 2017-09-19 09:16:39 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-05 22:33:20 +0000 |
commit | 92f4250ebce9404bc9a353e8683c7084c0936402 (patch) | |
tree | 22c3f49be0d59a32bd86efb600f65d1605cb41e0 /meta/recipes-connectivity/bluez5/bluez5/cve-2017-1000250.patch | |
parent | 9c136695f9507dd54e2741e310fc157c04a28270 (diff) | |
download | poky-92f4250ebce9404bc9a353e8683c7084c0936402.tar.gz |
bluez5: Upgrade 5.46 -> 5.47
This release includes:
- SDP fix for CVE-2017-1000250.
- New bluetooth mesh profile.
- Various fixes to GATT, A2DP and BR/EDR vs LE bearer handling.
This commit also drops the following two patches which are included in
5.47:
- 0001-hciattach-bcm43xx-fix-the-delay-timer-for-firmware-d.patch
- cve-2017-1000250.patch
(From OE-Core rev: cf25d927b2deadc11688b9dab2c366eaa57c54e6)
Signed-off-by: Marc Ferland <ferlandm@amotus.ca>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/bluez5/bluez5/cve-2017-1000250.patch')
-rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5/cve-2017-1000250.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5/cve-2017-1000250.patch b/meta/recipes-connectivity/bluez5/bluez5/cve-2017-1000250.patch deleted file mode 100644 index 9fac961bcf..0000000000 --- a/meta/recipes-connectivity/bluez5/bluez5/cve-2017-1000250.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | All versions of the SDP server in BlueZ 5.46 and earlier are vulnerable to an | ||
2 | information disclosure vulnerability which allows remote attackers to obtain | ||
3 | sensitive information from the bluetoothd process memory. This vulnerability | ||
4 | lies in the processing of SDP search attribute requests. | ||
5 | |||
6 | CVE: CVE-2017-1000250 | ||
7 | Upstream-Status: Backport | ||
8 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
9 | |||
10 | From 9e009647b14e810e06626dde7f1bb9ea3c375d09 Mon Sep 17 00:00:00 2001 | ||
11 | From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | ||
12 | Date: Wed, 13 Sep 2017 10:01:40 +0300 | ||
13 | Subject: sdp: Fix Out-of-bounds heap read in service_search_attr_req function | ||
14 | |||
15 | Check if there is enough data to continue otherwise return an error. | ||
16 | --- | ||
17 | src/sdpd-request.c | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/src/sdpd-request.c b/src/sdpd-request.c | ||
21 | index 1eefdce..318d044 100644 | ||
22 | --- a/src/sdpd-request.c | ||
23 | +++ b/src/sdpd-request.c | ||
24 | @@ -917,7 +917,7 @@ static int service_search_attr_req(sdp_req_t *req, sdp_buf_t *buf) | ||
25 | } else { | ||
26 | /* continuation State exists -> get from cache */ | ||
27 | sdp_buf_t *pCache = sdp_get_cached_rsp(cstate); | ||
28 | - if (pCache) { | ||
29 | + if (pCache && cstate->cStateValue.maxBytesSent < pCache->data_size) { | ||
30 | uint16_t sent = MIN(max, pCache->data_size - cstate->cStateValue.maxBytesSent); | ||
31 | pResponse = pCache->data; | ||
32 | memcpy(buf->data, pResponse + cstate->cStateValue.maxBytesSent, sent); | ||
33 | -- | ||
34 | cgit v1.1 | ||