mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-14 06:16:04 +01:00
audiofile: patch CVE-2017-6829
Use patch from buildroot:
434890df2a
Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
634cbcb91c
commit
f29fbaa465
|
|
@ -14,6 +14,7 @@ SRC_URI = " \
|
|||
file://0002-fix-build-on-gcc6.patch \
|
||||
file://0003-fix-CVE-2015-7747.patch \
|
||||
file://0004-Always-check-the-number-of-coefficients.patch \
|
||||
file://0005-clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "ea2449ad3f201ec590d811db9da6d02ffc5e87a677d06b92ab15363d8cb59782"
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,43 @@
|
|||
From 25eb00ce913452c2e614548d7df93070bf0d066f Mon Sep 17 00:00:00 2001
|
||||
From: Antonio Larrosa <larrosa@kde.org>
|
||||
Date: Mon, 6 Mar 2017 18:02:31 +0100
|
||||
Subject: [PATCH] clamp index values to fix index overflow in IMA.cpp
|
||||
|
||||
This fixes #33
|
||||
(also reported at https://bugzilla.opensuse.org/show_bug.cgi?id=1026981
|
||||
and https://blogs.gentoo.org/ago/2017/02/20/audiofile-global-buffer-overflow-in-decodesample-ima-cpp/)
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
|
||||
CVE: CVE-2017-6829
|
||||
Upstream-Status: Inactive-Upstream [lastrelease: 2013]
|
||||
Signed-off-by: Peter Marko <peter.marko@siemens.com>
|
||||
---
|
||||
libaudiofile/modules/IMA.cpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libaudiofile/modules/IMA.cpp b/libaudiofile/modules/IMA.cpp
|
||||
index 7476d44..df4aad6 100644
|
||||
--- a/libaudiofile/modules/IMA.cpp
|
||||
+++ b/libaudiofile/modules/IMA.cpp
|
||||
@@ -169,7 +169,7 @@ int IMA::decodeBlockWAVE(const uint8_t *encoded, int16_t *decoded)
|
||||
if (encoded[1] & 0x80)
|
||||
m_adpcmState[c].previousValue -= 0x10000;
|
||||
|
||||
- m_adpcmState[c].index = encoded[2];
|
||||
+ m_adpcmState[c].index = clamp(encoded[2], 0, 88);
|
||||
|
||||
*decoded++ = m_adpcmState[c].previousValue;
|
||||
|
||||
@@ -210,7 +210,7 @@ int IMA::decodeBlockQT(const uint8_t *encoded, int16_t *decoded)
|
||||
predictor -= 0x10000;
|
||||
|
||||
state.previousValue = clamp(predictor, MIN_INT16, MAX_INT16);
|
||||
- state.index = encoded[1] & 0x7f;
|
||||
+ state.index = clamp(encoded[1] & 0x7f, 0, 88);
|
||||
encoded += 2;
|
||||
|
||||
for (int n=0; n<m_framesPerPacket; n+=2)
|
||||
--
|
||||
2.11.0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user