Skip to contentSkip to conversation

bluez5: fix CVE-2018-10910

PATCH New Ross Burton 1 participant 2 messages Mar 25, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 bluez5: fix CVE-2018-10910

Fix this CVE (Bluetooth discoverability may be enabled with no agents to handle requests) by backporting a number of patches from upstream.

---
 meta/recipes-connectivity/bluez5/bluez5.inc        |   1 +
 .../bluez5/bluez5/CVE-2018-10910.patch             | 705 +++++++++++++++++++++
 2 files changed, 706 insertions(+)
 create mode 100644 meta/recipes-connectivity/bluez5/bluez5/CVE-2018-10910.patch
meta/recipes-connectivity/bluez5/bluez5.inc +1 -0
index 6d62f524591..aaf2af975d0 100644
@@ -53,6 +53,7 @@ SRC_URI = "\
     file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \
     file://0001-test-gatt-Fix-hung-issue.patch \
     file://0001-Makefile.am-Fix-a-race-issue-for-tools.patch \
+    file://CVE-2018-10910.patch \
 "
 S = "${WORKDIR}/bluez-${PV}"
 
meta/recipes-connectivity/bluez5/bluez5/CVE-2018-10910.patch new file +705 -0

705 lines not on this page · raw message

Signature · 1 line
2.11.0
#1 lore raw

PATCH 2/2 libsndfile1: fix CVE-2019-3832

The previous fix for CVE-2018-19758 wasn't complete, so backport another patch to solve it properly.

---
 .../libsndfile/libsndfile1/CVE-2019-3832.patch     | 37 ++++++++++++++++++++++
 .../libsndfile/libsndfile1_1.0.28.bb               |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2019-3832.patch
meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2019-3832.patch new file +37 -0
new file mode 100644
index 00000000000..ab37211399f
@@ -0,0 +1,37 @@
+From 43886efc408c21e1e329086ef70c88860310f25b Mon Sep 17 00:00:00 2001
+From: Emilio Pozuelo Monfort <[email protected]>
+Date: Tue, 5 Mar 2019 11:27:17 +0100
+Subject: [PATCH] wav_write_header: don't read past the array end
+
+CVE-2018-19758 wasn't entirely fixed in the fix, so fix it harder.
+
+CVE: CVE-2019-3832
+Upstream-Status: Backport [7408c4c788ce047d4e652b60a04e7796bcd7267e]
+Signed-off-by: Ross Burton <[email protected]>
+
+If loop_count is bigger than the array, truncate it to the array
+length (and not to 32k).
+
+CVE-2019-3832
+
+---
+ src/wav.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/wav.c b/src/wav.c
+index daae3cc..8851549 100644
+--- a/src/wav.c
++++ b/src/wav.c
+@@ -1094,8 +1094,10 @@ wav_write_header (SF_PRIVATE *psf, int calc_length)
+ 		psf_binheader_writef (psf, "44", 0, 0) ; /* SMTPE format */
+ 		psf_binheader_writef (psf, "44", psf->instrument->loop_count, 0) ;
+ 
+-		/* Loop count is signed 16 bit number so we limit it range to something sensible. */
+-		psf->instrument->loop_count &= 0x7fff ;
++		/* Make sure we don't read past the loops array end. */
++		if (psf->instrument->loop_count > ARRAY_LEN (psf->instrument->loops))
++			psf->instrument->loop_count = ARRAY_LEN (psf->instrument->loops) ;
++
+ 		for (tmp = 0 ; tmp < psf->instrument->loop_count ; tmp++)
+ 		{	int type ;
+ 
meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb +1 -0
index eb2c719d8da..77393db8470 100644
@@ -16,6 +16,7 @@ SRC_URI = "http://www.mega-nerd.com/libsndfile/files/libsndfile-${PV}.tar.gz \
            file://CVE-2018-19432.patch \
            file://CVE-2017-12562.patch \
            file://CVE-2018-19758.patch \
+           file://CVE-2019-3832.patch \
           "
 
 SRC_URI[md5sum] = "646b5f98ce89ac60cdb060fcd398247c"
Signature · 1 line
2.11.0