speex: fix CVE-2020-23903

Backport patch to fix CVE-2020-23903.

CVE: CVE-2020-23903

(From OE-Core rev: b8f56e5e9eef32c1e01742f913e205d93548de1f)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Kai Kang
2022-01-17 00:23:58 +08:00
committed by Richard Purdie
parent 63099553f6
commit 310fe1261d
2 changed files with 33 additions and 1 deletions

View File

@@ -0,0 +1,30 @@
Backport patch to fix CVE-2020-23903.
CVE: CVE-2020-23903
Upstream-Status: Backport [https://github.com/xiph/speex/commit/870ff84]
Signed-off-by: Kai Kang <kai.kang@windriver.com>
From 870ff845b32f314aec0036641ffe18aba4916887 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tmatth@videolan.org>
Date: Mon, 13 Jul 2020 23:25:03 -0400
Subject: [PATCH] wav_io: guard against invalid channel numbers
Fixes #13
---
src/wav_io.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/wav_io.c b/src/wav_io.c
index b5183015..09d62eb0 100644
--- a/src/wav_io.c
+++ b/src/wav_io.c
@@ -111,7 +111,7 @@ int read_wav_header(FILE *file, int *rate, int *channels, int *format, spx_int32
stmp = le_short(stmp);
*channels = stmp;
- if (stmp>2)
+ if (stmp>2 || stmp<1)
{
fprintf (stderr, "Only mono and (intensity) stereo supported\n");
return -1;

View File

@@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8 \
file://include/speex/speex.h;beginline=1;endline=34;md5=ef8c8ea4f7198d71cf3509c6ed05ea50"
DEPENDS = "libogg speexdsp"
SRC_URI = "http://downloads.xiph.org/releases/speex/speex-${PV}.tar.gz"
SRC_URI = "http://downloads.xiph.org/releases/speex/speex-${PV}.tar.gz \
file://CVE-2020-23903.patch \
"
UPSTREAM_CHECK_REGEX = "speex-(?P<pver>\d+(\.\d+)+)\.tar"
SRC_URI[md5sum] = "8ab7bb2589110dfaf0ed7fa7757dc49c"