diff options
| author |   Changhyeok Bae <changhyeok.bae@gmail.com> | 2017-12-13 12:08:42 +0000 |
|---|---|---|
| committer |   José Bollo <jose.bollo@iot.bzh> | 2018-02-13 11:01:59 +0100 |
| commit | f1f55eab0c57448a9cbb122947266b6ccde5eb1f (patch) | |
| tree | 82fcf8e52235ef633aec0f60a06c66fc85567c8a | |
| parent | d5a4dd4921f6b230ee341d4a6298c755afd0946e (diff) | |
bluez5: Remove CVE patch
cve-2017-1000250 is already applied in upstream openembedded-core.
Bug-AGL: SPEC-1181
Change-Id: Ia5f2cc3a266f61c7c842daaeea3d627fbb00025a
Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
| -rw-r--r-- | meta-agl/recipes-connectivity/bluez5/bluez5/cve-2017-1000250.patch | 34 | ||||
| -rw-r--r-- | meta-agl/recipes-connectivity/bluez5/bluez5_%.bbappend | 3 |
2 files changed, 1 insertions, 36 deletions
diff --git a/meta-agl/recipes-connectivity/bluez5/bluez5/cve-2017-1000250.patch b/meta-agl/recipes-connectivity/bluez5/bluez5/cve-2017-1000250.patch deleted file mode 100644 index 9fac961bc..000000000 --- a/meta-agl/recipes-connectivity/bluez5/bluez5/cve-2017-1000250.patch +++ /dev/null @@ -1,34 +0,0 @@ -All versions of the SDP server in BlueZ 5.46 and earlier are vulnerable to an -information disclosure vulnerability which allows remote attackers to obtain -sensitive information from the bluetoothd process memory. This vulnerability -lies in the processing of SDP search attribute requests. - -CVE: CVE-2017-1000250 -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 9e009647b14e810e06626dde7f1bb9ea3c375d09 Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> -Date: Wed, 13 Sep 2017 10:01:40 +0300 -Subject: sdp: Fix Out-of-bounds heap read in service_search_attr_req function - -Check if there is enough data to continue otherwise return an error. ---- - src/sdpd-request.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sdpd-request.c b/src/sdpd-request.c -index 1eefdce..318d044 100644 ---- a/src/sdpd-request.c -+++ b/src/sdpd-request.c -@@ -917,7 +917,7 @@ static int service_search_attr_req(sdp_req_t *req, sdp_buf_t *buf) - } else { - /* continuation State exists -> get from cache */ - sdp_buf_t *pCache = sdp_get_cached_rsp(cstate); -- if (pCache) { -+ if (pCache && cstate->cStateValue.maxBytesSent < pCache->data_size) { - uint16_t sent = MIN(max, pCache->data_size - cstate->cStateValue.maxBytesSent); - pResponse = pCache->data; - memcpy(buf->data, pResponse + cstate->cStateValue.maxBytesSent, sent); --- -cgit v1.1 diff --git a/meta-agl/recipes-connectivity/bluez5/bluez5_%.bbappend b/meta-agl/recipes-connectivity/bluez5/bluez5_%.bbappend index 543681550..ffb9d5b53 100644 --- a/meta-agl/recipes-connectivity/bluez5/bluez5_%.bbappend +++ b/meta-agl/recipes-connectivity/bluez5/bluez5_%.bbappend @@ -1,6 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" -SRC_URI_append = " file://bluetooth.conf \ - file://cve-2017-1000250.patch" +SRC_URI_append = " file://bluetooth.conf" do_install_append() { install -m 0644 ${WORKDIR}/bluetooth.conf ${D}${sysconfdir}/dbus-1/system.d/bluetooth.conf |