summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Marko <peter.marko@siemens.com>2025-03-16 23:53:56 +0100
committerKhem Raj <raj.khem@gmail.com>2025-03-16 16:35:00 -0700
commit89c017821ab3c8129112b2855c3000ec1fc632e7 (patch)
tree70aa7669cdf98f8998bc8c2a25233282cd89ef98
parent545ab1a7ad5859d412f924eb5d9556eef4bc411f (diff)
downloadmeta-openembedded-89c017821ab3c8129112b2855c3000ec1fc632e7.tar.gz
sox: patch CVE-2022-31651
Use patch from Debian: https://salsa.debian.org/lts-team/packages/sox/-/blob/debian/14.4.2+git20190427-1+deb10u3/debian/patches/CVE-2022-31651.patch Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-multimedia/recipes-multimedia/sox/sox/CVE-2022-31651.patch36
-rw-r--r--meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb1
2 files changed, 37 insertions, 0 deletions
diff --git a/meta-multimedia/recipes-multimedia/sox/sox/CVE-2022-31651.patch b/meta-multimedia/recipes-multimedia/sox/sox/CVE-2022-31651.patch
new file mode 100644
index 0000000000..853a69d210
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/sox/sox/CVE-2022-31651.patch
@@ -0,0 +1,36 @@
1From db9641ce748bdfb465fdfa9b7794de2f8da0a249 Mon Sep 17 00:00:00 2001
2From: Helmut Grohne <helmut@subdivi.de>
3Date: Sun, 16 Mar 2025 20:08:13 +0100
4Subject: [PATCH] formats: reject implausible rate
5
6Source: https://salsa.debian.org/lts-team/packages/sox/-/blob/debian/14.4.2+git20190427-1+deb10u3/debian/patches/CVE-2022-31651.patch
7
8CVE: CVE-2022-31651
9Upstream-Status: Inactive-Upstream [lastrelease: 2015]
10Signed-off-by: Peter Marko <peter.marko@siemens.com>
11---
12 src/formats_i.c | 10 ++++++++--
13 1 file changed, 8 insertions(+), 2 deletions(-)
14
15diff --git a/src/formats_i.c b/src/formats_i.c
16index 6a7c27e3..5f5ef979 100644
17--- a/src/formats_i.c
18+++ b/src/formats_i.c
19@@ -70,9 +70,15 @@ int lsx_check_read_params(sox_format_t * ft, unsigned channels,
20 ft->signal.channels = channels;
21 }
22
23- if (rate && ft->signal.rate && ft->signal.rate != rate)
24+ if (rate && ft->signal.rate && ft->signal.rate != rate) {
25 lsx_warn("`%s': overriding sample rate", ft->filename);
26- else ft->signal.rate = rate;
27+ /* Since NaN comparisons yield false, the negation rejects them. */
28+ } else if (!(rate > 0)) {
29+ lsx_fail_errno(ft, EINVAL, "invalid rate value");
30+ return SOX_EOF;
31+ } else {
32+ ft->signal.rate = rate;
33+ }
34
35 if (encoding && ft->encoding.encoding && ft->encoding.encoding != encoding)
36 lsx_warn("`%s': overriding encoding type", ft->filename);
diff --git a/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb b/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb
index e66c10a56d..94072cb35a 100644
--- a/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb
+++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb
@@ -34,6 +34,7 @@ SRC_URI = "git://git.code.sf.net/p/sox/code;protocol=https;branch=master \
34 file://CVE-2021-33844.patch \ 34 file://CVE-2021-33844.patch \
35 file://CVE-2021-40426.patch \ 35 file://CVE-2021-40426.patch \
36 file://CVE-2022-31650.patch \ 36 file://CVE-2022-31650.patch \
37 file://CVE-2022-31651.patch \
37 " 38 "
38 39
39# last release was in 2015, use latest hash from 2024-05-30 40# last release was in 2015, use latest hash from 2024-05-30