diff options
Diffstat (limited to 'meta-multimedia/recipes-multimedia/sox')
11 files changed, 300 insertions, 84 deletions
diff --git a/meta-multimedia/recipes-multimedia/sox/sox/0001-Update-exported-symbol-list.patch b/meta-multimedia/recipes-multimedia/sox/sox/0001-Update-exported-symbol-list.patch deleted file mode 100644 index 44c6b19be0..0000000000 --- a/meta-multimedia/recipes-multimedia/sox/sox/0001-Update-exported-symbol-list.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From b1809d82031aa7c5bcaad58bcb4b59e082e0446e Mon Sep 17 00:00:00 2001 | ||
2 | From: Mans Rullgard <mans@mansr.com> | ||
3 | Date: Sun, 5 Nov 2017 15:40:16 +0000 | ||
4 | Subject: [PATCH] Update exported symbol list | ||
5 | |||
6 | commit 5c58413544 ("Don't export (most) internal libsox symbols") | ||
7 | breaks dynamic flac builds as flac.c references lsx.error, so add it | ||
8 | to the list of exceptions. | ||
9 | |||
10 | | .libs/flac.o: In function `decoder_read_callback': | ||
11 | | /usr/src/debug/sox/14.4.2-r0/sox-14.4.2/src/flac.c:63: undefined reference to `lsx_error' | ||
12 | |||
13 | Upstream-Status: Backport [https://bogomips.org/sox.git ("pu" branch)] | ||
14 | |||
15 | --- | ||
16 | src/Makefile.am | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
20 | index 7cceaafd..a3a04ed1 100644 | ||
21 | --- a/src/Makefile.am | ||
22 | +++ b/src/Makefile.am | ||
23 | @@ -95,7 +95,7 @@ libsox_la_LIBADD += @GOMP_LIBS@ | ||
24 | |||
25 | libsox_la_CFLAGS = @WARN_CFLAGS@ | ||
26 | libsox_la_LDFLAGS = @APP_LDFLAGS@ -version-info @SHLIB_VERSION@ \ | ||
27 | - -export-symbols-regex '^(sox_.*|lsx_(check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|eof|fail_errno|filelength|find_(enum_(text|value)|file_extension)|getopt(_init)?|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|realloc|rewind|seeki|sigfigs3p?|strcasecmp|tell|unreadb|write(b|_b_buf|buf|s)))$$' | ||
28 | + -export-symbols-regex '^(sox_.*|lsx_(([cm]|re)alloc|check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|eof|error|fail_errno|filelength|find_(enum_(text|value)|file_extension)|flush|getopt(_init)?|id3_read_tag|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|rewind|seeki|sigfigs3p?|strcasecmp|strdup|tell|unreadb|write(b|_b_buf|buf|s)))$$' | ||
29 | |||
30 | if HAVE_WIN32_LTDL | ||
31 | libsox_la_SOURCES += win32-ltdl.c win32-ltdl.h | ||
32 | -- | ||
33 | 2.16.2 | ||
34 | |||
diff --git a/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch b/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch index 3085bd495c..15c429e515 100644 --- a/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch +++ b/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch | |||
@@ -15,7 +15,7 @@ diff --git a/src/formats.c b/src/formats.c | |||
15 | index 724a4cda..f683a922 100644 | 15 | index 724a4cda..f683a922 100644 |
16 | --- a/src/formats.c | 16 | --- a/src/formats.c |
17 | +++ b/src/formats.c | 17 | +++ b/src/formats.c |
18 | @@ -422,7 +422,6 @@ static void UNUSED rewind_pipe(FILE * fp) | 18 | @@ -477,7 +477,6 @@ static void UNUSED rewind_pipe(FILE * fp) |
19 | /* To fix this #error, either simply remove the #error line and live without | 19 | /* To fix this #error, either simply remove the #error line and live without |
20 | * file-type detection with pipes, or add support for your compiler in the | 20 | * file-type detection with pipes, or add support for your compiler in the |
21 | * lines above. Test with cat monkey.wav | ./sox --info - */ | 21 | * lines above. Test with cat monkey.wav | ./sox --info - */ |
diff --git a/meta-multimedia/recipes-multimedia/sox/sox/0001-tests-Include-math.h-for-fabs-definition.patch b/meta-multimedia/recipes-multimedia/sox/sox/0001-tests-Include-math.h-for-fabs-definition.patch deleted file mode 100644 index 5f9135a0ee..0000000000 --- a/meta-multimedia/recipes-multimedia/sox/sox/0001-tests-Include-math.h-for-fabs-definition.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From afe336ab63ff9b64ef759255de6b03b897dc4453 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 19 May 2024 09:09:46 -0700 | ||
4 | Subject: [PATCH] tests: Include math.h for fabs() definition | ||
5 | |||
6 | Fixes build with gcc-14 | ||
7 | |||
8 | ../../sox-14.4.2/src/sox_sample_test.h:190:3: error: implicit declaration of function 'fabs' [-Wimplicit-function-declaration] | ||
9 | 190 | assert(fabs(d - 1) < 1e-9 && clips == 0); | ||
10 | | ^~~~~~ | ||
11 | ../../sox-14.4.2/src/sox_sample_test.h:23:1: note: include '<math.h>' or provide a declaration of 'fabs' | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | src/sox_sample_test.h | 1 + | ||
17 | 1 file changed, 1 insertion(+) | ||
18 | |||
19 | diff --git a/src/sox_sample_test.h b/src/sox_sample_test.h | ||
20 | index 62b55e4..17f0069 100644 | ||
21 | --- a/src/sox_sample_test.h | ||
22 | +++ b/src/sox_sample_test.h | ||
23 | @@ -19,6 +19,7 @@ | ||
24 | #undef NDEBUG /* Must undef above assert.h or other that might include it. */ | ||
25 | #endif | ||
26 | #include <assert.h> | ||
27 | +#include <math.h> | ||
28 | #include "sox.h" | ||
29 | |||
30 | #define TEST_UINT(bits) \ | ||
31 | -- | ||
32 | 2.45.1 | ||
33 | |||
diff --git a/meta-multimedia/recipes-multimedia/sox/sox/CVE-2021-23159_CVE-2021-2317.patch b/meta-multimedia/recipes-multimedia/sox/sox/CVE-2021-23159_CVE-2021-2317.patch new file mode 100644 index 0000000000..df27cbcd65 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/sox/sox/CVE-2021-23159_CVE-2021-2317.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 8eb3afb37f80d7231a998e3074e6fc5f7bdfe4d5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Helmut Grohne <helmut@subdivi.de> | ||
3 | Date: Sun, 16 Mar 2025 20:28:15 +0100 | ||
4 | Subject: [PATCH] hcom: validate dictsize | ||
5 | |||
6 | Source: https://salsa.debian.org/lts-team/packages/sox/-/blob/debian/14.4.2+git20190427-1+deb10u3/debian/patches/CVE-2021-23159.patch | ||
7 | |||
8 | CVE: CVE-2021-23159 | ||
9 | CVE: CVE-2021-23172 | ||
10 | CVE: CVE-2023-34432 | ||
11 | Upstream-Status: Inactive-Upstream [lastrelease: 2015] | ||
12 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
13 | --- | ||
14 | src/hcom.c | 5 +++++ | ||
15 | 1 file changed, 5 insertions(+) | ||
16 | |||
17 | diff --git a/src/hcom.c b/src/hcom.c | ||
18 | index 594c8706..9e8b03c6 100644 | ||
19 | --- a/src/hcom.c | ||
20 | +++ b/src/hcom.c | ||
21 | @@ -141,6 +141,11 @@ static int startread(sox_format_t * ft) | ||
22 | return (SOX_EOF); | ||
23 | } | ||
24 | lsx_readw(ft, &dictsize); | ||
25 | + if (dictsize == 0 || dictsize > 511) | ||
26 | + { | ||
27 | + lsx_fail_errno(ft, SOX_EHDR, "Implausible dictionary size in HCOM header"); | ||
28 | + return SOX_EOF; | ||
29 | + } | ||
30 | |||
31 | /* Translate to sox parameters */ | ||
32 | ft->encoding.encoding = SOX_ENCODING_HCOM; | ||
diff --git a/meta-multimedia/recipes-multimedia/sox/sox/CVE-2021-33844.patch b/meta-multimedia/recipes-multimedia/sox/sox/CVE-2021-33844.patch new file mode 100644 index 0000000000..02c3edb35d --- /dev/null +++ b/meta-multimedia/recipes-multimedia/sox/sox/CVE-2021-33844.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From f2597e433afeee8ab00cf6368ec8519df34aa031 Mon Sep 17 00:00:00 2001 | ||
2 | From: Helmut Grohne <helmut@subdivi.de> | ||
3 | Date: Sun, 16 Mar 2025 23:19:43 +0100 | ||
4 | Subject: [PATCH] wav: reject 0 bits per sample to avoid division by zero | ||
5 | |||
6 | Source: https://salsa.debian.org/lts-team/packages/sox/-/blob/debian/14.4.2+git20190427-1+deb10u3/debian/patches/CVE-2021-33844.patch | ||
7 | |||
8 | CVE: CVE-2021-33844 | ||
9 | Upstream-Status: Inactive-Upstream [lastrelease: 2015] | ||
10 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
11 | --- | ||
12 | src/testall.sh | 1 + | ||
13 | src/wav.c | 5 +++++ | ||
14 | 2 files changed, 6 insertions(+) | ||
15 | |||
16 | diff --git a/src/testall.sh b/src/testall.sh | ||
17 | index e7398377..e1454c21 100755 | ||
18 | --- a/src/testall.sh | ||
19 | +++ b/src/testall.sh | ||
20 | @@ -67,3 +67,4 @@ t voc | ||
21 | t vox -r 8130 | ||
22 | t wav | ||
23 | t wve | ||
24 | +t wav -e gsm-full-rate | ||
25 | diff --git a/src/wav.c b/src/wav.c | ||
26 | index 3f6beb45..16f0bff8 100644 | ||
27 | --- a/src/wav.c | ||
28 | +++ b/src/wav.c | ||
29 | @@ -963,6 +963,11 @@ static int startread(sox_format_t *ft) | ||
30 | #endif | ||
31 | } | ||
32 | |||
33 | + if (ft->encoding.bits_per_sample == 0) | ||
34 | + { | ||
35 | + lsx_fail_errno(ft, SOX_EHDR, "WAV file bits per sample is zero"); | ||
36 | + return SOX_EOF; | ||
37 | + } | ||
38 | if (!wav->numSamples) | ||
39 | wav->numSamples = div_bits(qwDataLength, ft->encoding.bits_per_sample) | ||
40 | / ft->signal.channels; | ||
diff --git a/meta-multimedia/recipes-multimedia/sox/sox/CVE-2021-3643_CVE-2021-23210.patch b/meta-multimedia/recipes-multimedia/sox/sox/CVE-2021-3643_CVE-2021-23210.patch new file mode 100644 index 0000000000..f58d2fd774 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/sox/sox/CVE-2021-3643_CVE-2021-23210.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 5b9a7c0fc7054b4f16a5058eef721470e9adcfcc Mon Sep 17 00:00:00 2001 | ||
2 | From: Helmut Grohne <helmut@subdivi.de> | ||
3 | Date: Sun, 16 Mar 2025 21:16:40 +0100 | ||
4 | Subject: [PATCH] voc: word width should never be 0 to avoid division by zero | ||
5 | |||
6 | Source: https://salsa.debian.org/lts-team/packages/sox/-/blob/debian/14.4.2+git20190427-1+deb10u3/debian/patches/CVE-2021-3643.patch | ||
7 | |||
8 | CVE: CVE-2021-3643 | ||
9 | CVE: CVE-2021-23210 | ||
10 | Upstream-Status: Inactive-Upstream [lastrelease: 2015] | ||
11 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
12 | --- | ||
13 | src/voc.c | 4 ++++ | ||
14 | 1 file changed, 4 insertions(+) | ||
15 | |||
16 | diff --git a/src/voc.c b/src/voc.c | ||
17 | index a75639e9..0ca07f94 100644 | ||
18 | --- a/src/voc.c | ||
19 | +++ b/src/voc.c | ||
20 | @@ -625,6 +625,10 @@ static int getblock(sox_format_t * ft) | ||
21 | v->rate = new_rate_32; | ||
22 | ft->signal.rate = new_rate_32; | ||
23 | lsx_readb(ft, &uc); | ||
24 | + if (uc <= 1) { | ||
25 | + lsx_fail_errno(ft, SOX_EFMT, "2 bits per word required"); | ||
26 | + return (SOX_EOF); | ||
27 | + } | ||
28 | v->size = uc; | ||
29 | lsx_readb(ft, &uc); | ||
30 | if (v->channels != -1 && uc != v->channels) { | ||
diff --git a/meta-multimedia/recipes-multimedia/sox/sox/CVE-2021-40426.patch b/meta-multimedia/recipes-multimedia/sox/sox/CVE-2021-40426.patch new file mode 100644 index 0000000000..9e505a03a7 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/sox/sox/CVE-2021-40426.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 25f686e0da423326a74fe16c603b6b6b75857fa4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Helmut Grohne <helmut@subdivi.de> | ||
3 | Date: Sun, 16 Mar 2025 20:07:19 +0100 | ||
4 | Subject: [PATCH] sphere: avoid integer underflow | ||
5 | |||
6 | Source: https://salsa.debian.org/lts-team/packages/sox/-/blob/debian/14.4.2+git20190427-1+deb10u3/debian/patches/CVE-2021-40426.patch | ||
7 | |||
8 | CVE: CVE-2021-40426 | ||
9 | Upstream-Status: Inactive-Upstream [lastrelease: 2015] | ||
10 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
11 | --- | ||
12 | src/sphere.c | 6 ++++-- | ||
13 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/src/sphere.c b/src/sphere.c | ||
16 | index a3fd1c64..9544d160 100644 | ||
17 | --- a/src/sphere.c | ||
18 | +++ b/src/sphere.c | ||
19 | @@ -63,7 +63,8 @@ static int start_read(sox_format_t * ft) | ||
20 | return (SOX_EOF); | ||
21 | } | ||
22 | |||
23 | - header_size -= (strlen(buf) + 1); | ||
24 | + bytes_read = strlen(buf); | ||
25 | + header_size -= bytes_read >= header_size ? header_size : bytes_read + 1; | ||
26 | |||
27 | while (strncmp(buf, "end_head", (size_t)8) != 0) { | ||
28 | if (strncmp(buf, "sample_n_bytes", (size_t)14) == 0) | ||
29 | @@ -105,7 +106,8 @@ static int start_read(sox_format_t * ft) | ||
30 | return (SOX_EOF); | ||
31 | } | ||
32 | |||
33 | - header_size -= (strlen(buf) + 1); | ||
34 | + bytes_read = strlen(buf); | ||
35 | + header_size -= bytes_read >= header_size ? header_size : bytes_read + 1; | ||
36 | } | ||
37 | |||
38 | if (!bytes_per_sample) | ||
diff --git a/meta-multimedia/recipes-multimedia/sox/sox/CVE-2022-31650.patch b/meta-multimedia/recipes-multimedia/sox/sox/CVE-2022-31650.patch new file mode 100644 index 0000000000..41baad0e27 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/sox/sox/CVE-2022-31650.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | From 3a8e783c58499bb52052c671b9161c43e011a508 Mon Sep 17 00:00:00 2001 | ||
2 | From: Helmut Grohne <helmut@subdivi.de> | ||
3 | Date: Sun, 16 Mar 2025 20:08:04 +0100 | ||
4 | Subject: [PATCH] formats+aiff: reject implausibly large number of channels | ||
5 | |||
6 | Source: https://salsa.debian.org/lts-team/packages/sox/-/blob/debian/14.4.2+git20190427-1+deb10u3/debian/patches/CVE-2022-31650.patch | ||
7 | |||
8 | CVE: CVE-2022-31650 | ||
9 | Upstream-Status: Inactive-Upstream [lastrelease: 2015] | ||
10 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
11 | --- | ||
12 | src/aiff.c | 5 +++++ | ||
13 | src/formats_i.c | 10 ++++++++-- | ||
14 | 2 files changed, 13 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/src/aiff.c b/src/aiff.c | ||
17 | index 3a152c58..6de94f32 100644 | ||
18 | --- a/src/aiff.c | ||
19 | +++ b/src/aiff.c | ||
20 | @@ -619,6 +619,11 @@ int lsx_aiffstartwrite(sox_format_t * ft) | ||
21 | At 48 kHz, 16 bits stereo, this gives ~3 hours of audio. | ||
22 | Sorry, the AIFF format does not provide for an indefinite | ||
23 | number of samples. */ | ||
24 | + if (ft->signal.channels >= (0x7f000000 / (ft->encoding.bits_per_sample >> 3))) | ||
25 | + { | ||
26 | + lsx_fail_errno(ft, SOX_EOF, "too many channels for AIFF header"); | ||
27 | + return SOX_EOF; | ||
28 | + } | ||
29 | return(aiffwriteheader(ft, (uint64_t) 0x7f000000 / ((ft->encoding.bits_per_sample>>3)*ft->signal.channels))); | ||
30 | } | ||
31 | |||
32 | diff --git a/src/formats_i.c b/src/formats_i.c | ||
33 | index 7048040d..6a7c27e3 100644 | ||
34 | --- a/src/formats_i.c | ||
35 | +++ b/src/formats_i.c | ||
36 | @@ -19,6 +19,7 @@ | ||
37 | */ | ||
38 | |||
39 | #include "sox_i.h" | ||
40 | +#include <limits.h> | ||
41 | #include <string.h> | ||
42 | #include <sys/stat.h> | ||
43 | #include <stdarg.h> | ||
44 | @@ -60,9 +61,14 @@ int lsx_check_read_params(sox_format_t * ft, unsigned channels, | ||
45 | if (ft->seekable) | ||
46 | ft->data_start = lsx_tell(ft); | ||
47 | |||
48 | - if (channels && ft->signal.channels && ft->signal.channels != channels) | ||
49 | + if (channels && ft->signal.channels && ft->signal.channels != channels) { | ||
50 | lsx_warn("`%s': overriding number of channels", ft->filename); | ||
51 | - else ft->signal.channels = channels; | ||
52 | + } else if (channels > SHRT_MAX) { | ||
53 | + lsx_fail_errno(ft, EINVAL, "implausibly large number of channels"); | ||
54 | + return SOX_EOF; | ||
55 | + } else { | ||
56 | + ft->signal.channels = channels; | ||
57 | + } | ||
58 | |||
59 | if (rate && ft->signal.rate && ft->signal.rate != rate) | ||
60 | lsx_warn("`%s': overriding sample rate", ft->filename); | ||
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 @@ | |||
1 | From db9641ce748bdfb465fdfa9b7794de2f8da0a249 Mon Sep 17 00:00:00 2001 | ||
2 | From: Helmut Grohne <helmut@subdivi.de> | ||
3 | Date: Sun, 16 Mar 2025 20:08:13 +0100 | ||
4 | Subject: [PATCH] formats: reject implausible rate | ||
5 | |||
6 | Source: https://salsa.debian.org/lts-team/packages/sox/-/blob/debian/14.4.2+git20190427-1+deb10u3/debian/patches/CVE-2022-31651.patch | ||
7 | |||
8 | CVE: CVE-2022-31651 | ||
9 | Upstream-Status: Inactive-Upstream [lastrelease: 2015] | ||
10 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
11 | --- | ||
12 | src/formats_i.c | 10 ++++++++-- | ||
13 | 1 file changed, 8 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/src/formats_i.c b/src/formats_i.c | ||
16 | index 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/CVE-2023-32627.patch b/meta-multimedia/recipes-multimedia/sox/sox/CVE-2023-32627.patch new file mode 100644 index 0000000000..b4e9994eab --- /dev/null +++ b/meta-multimedia/recipes-multimedia/sox/sox/CVE-2023-32627.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From b0b7e7fa7a48485c4d6b0ae64bfddedd519716f5 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?utf-8?q?Bastien_Roucari=C3=A8s?= <rouca@debian.org> | ||
3 | Date: Sun, 16 Mar 2025 23:25:15 +0100 | ||
4 | Subject: [PATCH] CVE-2023-32627 Filter null sampling rate in VOC coder | ||
5 | |||
6 | Source: https://salsa.debian.org/lts-team/packages/sox/-/blob/debian/14.4.2+git20190427-1+deb10u3/debian/patches/0028-CVE-2023-32627-Filter-null-sampling-rate-in-VOC-code.patch | ||
7 | |||
8 | CVE: CVE-2023-32627 | ||
9 | Upstream-Status: Inactive-Upstream [lastrelease: 2015] | ||
10 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
11 | --- | ||
12 | src/voc.c | 5 +++++ | ||
13 | 1 file changed, 5 insertions(+) | ||
14 | |||
15 | diff --git a/src/voc.c b/src/voc.c | ||
16 | index 0ca07f94..d8b982c5 100644 | ||
17 | --- a/src/voc.c | ||
18 | +++ b/src/voc.c | ||
19 | @@ -353,6 +353,11 @@ static size_t read_samples(sox_format_t * ft, sox_sample_t * buf, | ||
20 | v->block_remaining = 0; | ||
21 | return done; | ||
22 | } | ||
23 | + if(uc == 0) { | ||
24 | + lsx_fail_errno(ft, EINVAL, "invalid rate value"); | ||
25 | + v->block_remaining = 0; | ||
26 | + return done; | ||
27 | + } | ||
28 | *buf = SOX_UNSIGNED_8BIT_TO_SAMPLE(uc,); | ||
29 | lsx_adpcm_init(&v->adpcm, 6 - v->size, SOX_SAMPLE_TO_SIGNED_16BIT(*buf, ft->clips)); | ||
30 | ++buf; | ||
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 800fcad2c9..90a7a85df8 100644 --- a/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb +++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb | |||
@@ -1,39 +1,56 @@ | |||
1 | DESCRIPTION="SoX is the Swiss Army knife of sound processing tools. \ | 1 | DESCRIPTION = "SoX is the Swiss Army knife of sound processing tools. \ |
2 | It converts audio files among various standard audio file formats \ | 2 | It converts audio files among various standard audio file formats \ |
3 | and can apply different effects and filters to the audio data." | 3 | and can apply different effects and filters to the audio data." |
4 | HOMEPAGE = "http://sox.sourceforge.net" | 4 | HOMEPAGE = "http://sox.sourceforge.net" |
5 | SECTION = "audio" | 5 | SECTION = "audio" |
6 | 6 | ||
7 | DEPENDS = "libpng libsndfile1 libtool" | 7 | DEPENDS = "autoconf-archive-native libpng libsndfile1 libtool" |
8 | 8 | ||
9 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)} \ | 9 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)} \ |
10 | magic \ | 10 | magic \ |
11 | " | 11 | " |
12 | PACKAGECONFIG[pulseaudio] = "--with-pulseaudio=dyn,--with-pulseaudio=no,pulseaudio," | 12 | PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio=dyn,--disable-pulseaudio,pulseaudio," |
13 | PACKAGECONFIG[alsa] = "--with-alsa=dyn,--with-alsa=no,alsa-lib," | 13 | PACKAGECONFIG[alsa] = "--enable-alsa=dyn,--disable-alsa,alsa-lib," |
14 | PACKAGECONFIG[wavpack] = "--with-wavpack=dyn,--with-wavpack=no,wavpack," | 14 | PACKAGECONFIG[wavpack] = "--enable-wavpack=dyn,--disable-wavpack,wavpack," |
15 | PACKAGECONFIG[flac] = "--with-flac=dyn,--with-flac=no,flac," | 15 | PACKAGECONFIG[flac] = "--enable-flac=dyn,--disable-flac,flac," |
16 | PACKAGECONFIG[amrwb] = "--with-amrwb=dyn,--with-amrwb=no,opencore-amr," | 16 | PACKAGECONFIG[amrwb] = "--enable-amrwb=dyn,--disable-amrwb,opencore-amr," |
17 | PACKAGECONFIG[amrnb] = "--with-amrnb=dyn,--with-amrnb=no,opencore-amr," | 17 | PACKAGECONFIG[amrnb] = "--enable-amrnb=dyn,--disable-amrnb,opencore-amr," |
18 | PACKAGECONFIG[oggvorbis] = "--with-oggvorbis=dyn,--with-oggvorbis=no,libvorbis" | 18 | PACKAGECONFIG[oggvorbis] = "--enable-oggvorbis=dyn,--disable-oggvorbis,libvorbis" |
19 | PACKAGECONFIG[opus] = "--with-opus=dyn,--with-opus=no,opusfile" | 19 | PACKAGECONFIG[opus] = "--enable-opus=dyn,--disable-opus,opusfile" |
20 | PACKAGECONFIG[magic] = "--with-magic,--without-magic,file," | 20 | PACKAGECONFIG[magic] = "--with-magic,--without-magic,file," |
21 | PACKAGECONFIG[mad] = "--with-mad,--without-mad,libmad," | 21 | PACKAGECONFIG[mad] = "--with-mad,--without-mad,libmad," |
22 | PACKAGECONFIG[id3tag] = "--with-id3tag,--without-id3tag,libid3tag," | 22 | PACKAGECONFIG[id3tag] = "--with-id3tag,--without-id3tag,libid3tag," |
23 | PACKAGECONFIG[lame] = "--with-lame,--without-lame,lame," | 23 | PACKAGECONFIG[lame] = "--with-lame,--without-lame,lame," |
24 | PACKAGECONFIG[ao] = "--with-ao,--without-ao,libao," | 24 | PACKAGECONFIG[ao] = "--enable-ao,--disable-ao,libao," |
25 | 25 | ||
26 | LICENSE = "GPL-2.0-only & LGPL-2.1-only" | 26 | LICENSE = "GPL-2.0-only & LGPL-2.1-only" |
27 | LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \ | 27 | LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \ |
28 | file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24" | 28 | file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24" |
29 | 29 | ||
30 | SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz \ | 30 | SRC_URI = "git://git.code.sf.net/p/sox/code;protocol=https;branch=master \ |
31 | file://0001-remove-the-error-line-and-live-without-file-type-det.patch \ | 31 | file://0001-remove-the-error-line-and-live-without-file-type-det.patch \ |
32 | file://0001-Update-exported-symbol-list.patch \ | 32 | file://CVE-2021-3643_CVE-2021-23210.patch \ |
33 | file://0001-tests-Include-math.h-for-fabs-definition.patch \ | 33 | file://CVE-2021-23159_CVE-2021-2317.patch \ |
34 | file://CVE-2021-33844.patch \ | ||
35 | file://CVE-2021-40426.patch \ | ||
36 | file://CVE-2022-31650.patch \ | ||
37 | file://CVE-2022-31651.patch \ | ||
38 | file://CVE-2023-32627.patch \ | ||
34 | " | 39 | " |
35 | SRC_URI[md5sum] = "d04fba2d9245e661f245de0577f48a33" | 40 | |
36 | SRC_URI[sha256sum] = "b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3bb55f6c" | 41 | # last release was in 2015, use latest hash from 2024-05-30 |
42 | PV .= "+git" | ||
43 | SRCREV = "f3094754a7c2a7e55c35621d20fa9945736e72df" | ||
44 | |||
45 | CVE_PRODUCT:append = " libsox_project:libsox sound_exchange_project:sound_exchange" | ||
46 | |||
47 | CVE_STATUS_GROUPS += "CVE_STATUS_HASH_UPDATE" | ||
48 | CVE_STATUS_HASH_UPDATE = " \ | ||
49 | CVE-2017-11332 CVE-2017-11358 CVE-2017-11359 CVE-2017-15370 CVE-2017-15371 \ | ||
50 | CVE-2017-15372 CVE-2017-15642 CVE-2017-18189 CVE-2019-13590 CVE-2019-8354 \ | ||
51 | CVE-2019-8355 CVE-2019-8356 CVE-2019-8357 CVE-2019-1010004 \ | ||
52 | " | ||
53 | CVE_STATUS_HASH_UPDATE[status] = "fixed-version: patched in current git hash" | ||
37 | 54 | ||
38 | inherit autotools pkgconfig | 55 | inherit autotools pkgconfig |
39 | 56 | ||