<div dir="ltr">It's too late for this in master, but I've queued it in my branch for when master reopens.<div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 19 September 2017 at 14:16, Marc Ferland <span dir="ltr"><<a href="mailto:ferlandm@amotus.ca" target="_blank">ferlandm@amotus.ca</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This release includes:<br>
<br>
- SDP fix for CVE-2017-1000250.<br>
- New bluetooth mesh profile.<br>
- Various fixes to GATT, A2DP and BR/EDR vs LE bearer handling.<br>
<br>
This commit also drops the following two patches which are included in<br>
5.47:<br>
<br>
- 0001-hciattach-bcm43xx-fix-<wbr>the-delay-timer-for-firmware-<wbr>d.patch<br>
- cve-2017-1000250.patch<br>
<br>
Signed-off-by: Marc Ferland <<a href="mailto:ferlandm@amotus.ca">ferlandm@amotus.ca</a>><br>
---<br>
meta/recipes-connectivity/<wbr>bluez5/bluez5.inc | 3 +-<br>
...cm43xx-fix-the-delay-timer-<wbr>for-firmware-d.patch | 36 ----------------------<br>
.../bluez5/bluez5/cve-2017-<wbr>1000250.patch | 34 --------------------<br>
.../bluez5/{<a href="http://bluez5_5.46.bb" rel="noreferrer" target="_blank">bluez5_5.46.bb</a> => <a href="http://bluez5_5.47.bb" rel="noreferrer" target="_blank">bluez5_5.47.bb</a>} | 4 +--<br>
4 files changed, 3 insertions(+), 74 deletions(-)<br>
delete mode 100644 meta/recipes-connectivity/<wbr>bluez5/bluez5/0001-hciattach-<wbr>bcm43xx-fix-the-delay-timer-<wbr>for-firmware-d.patch<br>
delete mode 100644 meta/recipes-connectivity/<wbr>bluez5/bluez5/cve-2017-<wbr>1000250.patch<br>
rename meta/recipes-connectivity/<wbr>bluez5/{<a href="http://bluez5_5.46.bb" rel="noreferrer" target="_blank">bluez5_5.46.bb</a> => <a href="http://bluez5_5.47.bb" rel="noreferrer" target="_blank">bluez5_5.47.bb</a>} (91%)<br>
<br>
diff --git a/meta/recipes-connectivity/<wbr>bluez5/bluez5.inc b/meta/recipes-connectivity/<wbr>bluez5/bluez5.inc<br>
index 2ae4553d48..3a8d3476ea 100644<br>
--- a/meta/recipes-connectivity/<wbr>bluez5/bluez5.inc<br>
+++ b/meta/recipes-connectivity/<wbr>bluez5/bluez5.inc<br>
@@ -41,6 +41,7 @@ PACKAGECONFIG[sixaxis] = "--enable-sixaxis,--disable-<wbr>sixaxis"<br>
PACKAGECONFIG[tools] = "--enable-tools,--disable-<wbr>tools"<br>
PACKAGECONFIG[threads] = "--enable-threads,--disable-<wbr>threads"<br>
PACKAGECONFIG[deprecated] = "--enable-deprecated,--<wbr>disable-deprecated"<br>
+PACKAGECONFIG[mesh] = "--enable-mesh,--disable-mesh, json-c"<br>
<br>
SRC_URI = "\<br>
${KERNELORG_MIRROR}/linux/<wbr>bluetooth/bluez-${PV}.tar.xz \<br>
@@ -49,8 +50,6 @@ SRC_URI = "\<br>
file://run-ptest \<br>
${@bb.utils.contains('DISTRO_<wbr>FEATURES', 'systemd', '', 'file://0001-Allow-using-<wbr>obexd-without-systemd-in-the-<wbr>user-sessio.patch', d)} \<br>
file://0001-tests-add-a-<wbr>target-for-building-tests-<wbr>without-runnin.patch \<br>
- file://0001-hciattach-bcm43xx-<wbr>fix-the-delay-timer-for-<wbr>firmware-d.patch \<br>
- file://cve-2017-1000250.patch \<br>
"<br>
S = "${WORKDIR}/bluez-${PV}"<br>
<br>
diff --git a/meta/recipes-connectivity/<wbr>bluez5/bluez5/0001-hciattach-<wbr>bcm43xx-fix-the-delay-timer-<wbr>for-firmware-d.patch b/meta/recipes-connectivity/<wbr>bluez5/bluez5/0001-hciattach-<wbr>bcm43xx-fix-the-delay-timer-<wbr>for-firmware-d.patch<br>
deleted file mode 100644<br>
index 46794381f7..0000000000<br>
--- a/meta/recipes-connectivity/<wbr>bluez5/bluez5/0001-hciattach-<wbr>bcm43xx-fix-the-delay-timer-<wbr>for-firmware-d.patch<br>
+++ /dev/null<br>
@@ -1,36 +0,0 @@<br>
-From 3b341fb421ef61db7782bf1314ec69<wbr>3828467de9 Mon Sep 17 00:00:00 2001<br>
-From: Andy Duan <<a href="mailto:fugang.duan@nxp.com">fugang.duan@nxp.com</a>><br>
-Date: Wed, 23 Nov 2016 17:12:12 +0800<br>
-Subject: [PATCH] hciattach: bcm43xx: fix the delay timer for firmware download<br>
-<br>
-From the log in .bcm43xx_load_firmware():<br>
- /* Wait 50ms to let the firmware placed in download mode */<br>
- nanosleep(&tm_mode, NULL);<br>
-<br>
-But timespec tm_mode is real is 50us. Correct the delayed timer count.<br>
-<br>
-Upstream-Status: Accepted [<a href="https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=76255f732d68aef2b90d36d9c7be51a9e1739ce7" rel="noreferrer" target="_blank">https://git.kernel.org/pub/<wbr>scm/bluetooth/bluez.git/<wbr>commit/?id=<wbr>76255f732d68aef2b90d36d9c7be51<wbr>a9e1739ce7</a>]<br>
-<br>
-Signed-off-by: Fugang Duan <<a href="mailto:fugang.duan@nxp.com">fugang.duan@nxp.com</a>><br>
----<br>
- tools/hciattach_bcm43xx.c | 4 ++--<br>
- 1 file changed, 2 insertions(+), 2 deletions(-)<br>
-<br>
-diff --git a/tools/hciattach_bcm43xx.c b/tools/hciattach_bcm43xx.c<br>
-index 81f38cb..ac1b3c1 100644<br>
---- a/tools/hciattach_bcm43xx.c<br>
-+++ b/tools/hciattach_bcm43xx.c<br>
-@@ -228,8 +228,8 @@ static int bcm43xx_set_speed(int fd, struct termios *ti, uint32_t speed)<br>
- static int bcm43xx_load_firmware(int fd, const char *fw)<br>
- {<br>
- unsigned char cmd[] = { HCI_COMMAND_PKT, 0x2e, 0xfc, 0x00 };<br>
-- struct timespec tm_mode = { 0, 50000 };<br>
-- struct timespec tm_ready = { 0, 2000000 };<br>
-+ struct timespec tm_mode = { 0, 50000000 };<br>
-+ struct timespec tm_ready = { 0, 200000000 };<br>
- unsigned char resp[CC_MIN_SIZE];<br>
- unsigned char tx_buf[1024];<br>
- int len, fd_fw, n;<br>
---<br>
-1.9.1<br>
-<br>
diff --git a/meta/recipes-connectivity/<wbr>bluez5/bluez5/cve-2017-<wbr>1000250.patch b/meta/recipes-connectivity/<wbr>bluez5/bluez5/cve-2017-<wbr>1000250.patch<br>
deleted file mode 100644<br>
index 9fac961bcf..0000000000<br>
--- a/meta/recipes-connectivity/<wbr>bluez5/bluez5/cve-2017-<wbr>1000250.patch<br>
+++ /dev/null<br>
@@ -1,34 +0,0 @@<br>
-All versions of the SDP server in BlueZ 5.46 and earlier are vulnerable to an<br>
-information disclosure vulnerability which allows remote attackers to obtain<br>
-sensitive information from the bluetoothd process memory. This vulnerability<br>
-lies in the processing of SDP search attribute requests.<br>
-<br>
-CVE: CVE-2017-1000250<br>
-Upstream-Status: Backport<br>
-Signed-off-by: Ross Burton <<a href="mailto:ross.burton@intel.com">ross.burton@intel.com</a>><br>
-<br>
-From 9e009647b14e810e06626dde7f1bb9<wbr>ea3c375d09 Mon Sep 17 00:00:00 2001<br>
-From: Luiz Augusto von Dentz <<a href="mailto:luiz.von.dentz@intel.com">luiz.von.dentz@intel.com</a>><br>
-Date: Wed, 13 Sep 2017 10:01:40 +0300<br>
-Subject: sdp: Fix Out-of-bounds heap read in service_search_attr_req function<br>
-<br>
-Check if there is enough data to continue otherwise return an error.<br>
----<br>
- src/sdpd-request.c | 2 +-<br>
- 1 file changed, 1 insertion(+), 1 deletion(-)<br>
-<br>
-diff --git a/src/sdpd-request.c b/src/sdpd-request.c<br>
-index 1eefdce..318d044 100644<br>
---- a/src/sdpd-request.c<br>
-+++ b/src/sdpd-request.c<br>
-@@ -917,7 +917,7 @@ static int service_search_attr_req(sdp_<wbr>req_t *req, sdp_buf_t *buf)<br>
- } else {<br>
- /* continuation State exists -> get from cache */<br>
- sdp_buf_t *pCache = sdp_get_cached_rsp(cstate);<br>
-- if (pCache) {<br>
-+ if (pCache && cstate->cStateValue.<wbr>maxBytesSent < pCache->data_size) {<br>
- uint16_t sent = MIN(max, pCache->data_size - cstate->cStateValue.<wbr>maxBytesSent);<br>
- pResponse = pCache->data;<br>
- memcpy(buf->data, pResponse + cstate->cStateValue.<wbr>maxBytesSent, sent);<br>
---<br>
-cgit v1.1<br>
diff --git a/meta/recipes-connectivity/<wbr>bluez5/<a href="http://bluez5_5.46.bb" rel="noreferrer" target="_blank">bluez5_5.46.bb</a> b/meta/recipes-connectivity/<wbr>bluez5/<a href="http://bluez5_5.47.bb" rel="noreferrer" target="_blank">bluez5_5.47.bb</a><br>
similarity index 91%<br>
rename from meta/recipes-connectivity/<wbr>bluez5/<a href="http://bluez5_5.46.bb" rel="noreferrer" target="_blank">bluez5_5.46.bb</a><br>
rename to meta/recipes-connectivity/<wbr>bluez5/<a href="http://bluez5_5.47.bb" rel="noreferrer" target="_blank">bluez5_5.47.bb</a><br>
index e1f85879ce..49666f226c 100644<br>
--- a/meta/recipes-connectivity/<wbr>bluez5/<a href="http://bluez5_5.46.bb" rel="noreferrer" target="_blank">bluez5_5.46.bb</a><br>
+++ b/meta/recipes-connectivity/<wbr>bluez5/<a href="http://bluez5_5.47.bb" rel="noreferrer" target="_blank">bluez5_5.47.bb</a><br>
@@ -2,8 +2,8 @@ require bluez5.inc<br>
<br>
REQUIRED_DISTRO_FEATURES = "bluez5"<br>
<br>
-SRC_URI[md5sum] = "<wbr>913f35d6fa4ca5772c53adb936bf19<wbr>47"<br>
-SRC_URI[sha256sum] = "<wbr>ddab3d3837c1afb8ae228a94ba1770<wbr>9a4650bd4db24211b6771ab735c890<wbr>8e28"<br>
+SRC_URI[md5sum] = "<wbr>783e15f65e70cdb8f721c659e140dd<wbr>56"<br>
+SRC_URI[sha256sum] = "<wbr>cf75bf7cd5d564f21cc4a2bd01d5c3<wbr>9ce425397335fd47d9bbe43af0a583<wbr>42c8"<br>
<br>
# noinst programs in Makefile.tools that are conditional on READLINE<br>
# support<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.11.0<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div>