aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/bluez/APKBUILD18
-rw-r--r--main/bluez/CVE-2017-1000250.patch25
2 files changed, 38 insertions, 5 deletions
diff --git a/main/bluez/APKBUILD b/main/bluez/APKBUILD
index f76e76d219..6b9a88d4c6 100644
--- a/main/bluez/APKBUILD
+++ b/main/bluez/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bluez
pkgver=5.36
-pkgrel=0
+pkgrel=1
pkgdesc="Tools for the Bluetooth protocol stack"
url="http://www.bluez.org/"
arch="all"
@@ -18,9 +18,14 @@ source="http://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz
bluetooth.initd
rfcomm.initd
rfcomm.confd
+ CVE-2017-1000250.patch
"
-
_builddir="$srcdir"/bluez-$pkgver
+
+# secfixes:
+# 5.36-r1:
+# - CVE-2017-1000250
+
prepare() {
cd "$_builddir"
for i in $source; do
@@ -74,12 +79,15 @@ hid2hci() {
md5sums="9a0ee479cacc44fac68f6a65b1cd3eba bluez-5.36.tar.xz
4ec3395eff42b3481a0a77f36ca57d0b bluetooth.initd
f90b2cc8fe3f0e4bed64b01c0ba0205d rfcomm.initd
-7f4bb093adb0f519c621f2ea68712f35 rfcomm.confd"
+7f4bb093adb0f519c621f2ea68712f35 rfcomm.confd
+caf97389e55729d120bfef92e3f4f91f CVE-2017-1000250.patch"
sha256sums="a343ea1aeb53d3bd139087f3b1c1e1fb70db452d9762cc7a3d23e75962e578f2 bluez-5.36.tar.xz
04395bdcbf69aafea1d127204677c72a6bf42bde1e8f809d31472ec5fa75057d bluetooth.initd
9407186d0a647af2228d5603a13cf7aaba5fac842c147aa46334c3d729b552d4 rfcomm.initd
-672498957049fd301f9c9c1dc9fa49430e5e6d3c3f1f3cdce80df3af7d425d08 rfcomm.confd"
+672498957049fd301f9c9c1dc9fa49430e5e6d3c3f1f3cdce80df3af7d425d08 rfcomm.confd
+c82c11e89ef474fd3efecaa6b872fb995262a01fe96fe67297d8dbff70994996 CVE-2017-1000250.patch"
sha512sums="2cff79533d052d5b718101d31093cce34849dd316a41597384d0e777679ca96d83537f0cf7a5d7a1d5919c8f2afdd7164536b104cba616dde230e774c55774c3 bluez-5.36.tar.xz
0a5c652effebe5f2fd968535b2d99e8b9b6983f847fd162f80e5965ade4b7bd12165d27b348506a08503d1bc8c2cf5c8265758ca1e9670dfb5e765edf121fd96 bluetooth.initd
8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac rfcomm.initd
-a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb rfcomm.confd"
+a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb rfcomm.confd
+cb230dc193c8bee6fb297b5ef33fefc91feba8d780f4e7127b648835e3c4445ce9ac05ad6a1cf5bcf470d3c6750424f7193e45ad0ad3f236da8240422cdeba81 CVE-2017-1000250.patch"
diff --git a/main/bluez/CVE-2017-1000250.patch b/main/bluez/CVE-2017-1000250.patch
new file mode 100644
index 0000000000..f088ef38f2
--- /dev/null
+++ b/main/bluez/CVE-2017-1000250.patch
@@ -0,0 +1,25 @@
+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