diff --git a/backport-CVE-2022-33065.patch b/backport-CVE-2022-33065.patch new file mode 100644 index 0000000000000000000000000000000000000000..3bc3f1920f717d9beb4742c448b357e68c659601 --- /dev/null +++ b/backport-CVE-2022-33065.patch @@ -0,0 +1,42 @@ +From da1fcb0199f6a5c883fd158a20896a0e9c085e02 Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Wed, 22 Nov 2023 17:15:12 +0800 +Subject: [PATCH] mat4/mat5: fix int overflow in dataend calculation +The clang sanitizer warns of a possible signed integer overflow when +calculating the `dataend` value in `mat4_read_header()`. + +``` +src/mat4.c:323:41: runtime error: signed integer overflow: 205 * -100663296 cannot be represented in type 'int' +SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior src/mat4.c:323:41 in +src/mat4.c:323:48: runtime error: signed integer overflow: 838860800 * 4 cannot be represented in type 'int' +SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior src/mat4.c:323:48 in +``` + +Cast the offending `rows` and `cols` ints to `sf_count_t` (the type of +`dataend` before performing the calculation, to avoid the issue. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/789 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +--- + src/mat4.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mat4.c b/src/mat4.c +index 3c73680..e2f98b7 100644 +--- a/src/mat4.c ++++ b/src/mat4.c +@@ -320,7 +320,7 @@ mat4_read_header (SF_PRIVATE *psf) + psf->filelength - psf->dataoffset, psf->sf.channels * psf->sf.frames * psf->bytewidth) ; + } + else if ((psf->filelength - psf->dataoffset) > psf->sf.channels * psf->sf.frames * psf->bytewidth) +- psf->dataend = psf->dataoffset + rows * cols * psf->bytewidth ; ++ psf->dataend = psf->dataoffset + (sf_count_t) rows * (sf_count_t) cols * psf->bytewidth ; + + psf->datalength = psf->filelength - psf->dataoffset - psf->dataend ; + +-- +2.27.0 + diff --git a/libsndfile.spec b/libsndfile.spec index 2c8a23db4f16a0a5a25524cd222e4ccc28b7fd11..efbfd1b4c85cbb94f84efc19ac331991597652d0 100644 --- a/libsndfile.spec +++ b/libsndfile.spec @@ -1,6 +1,6 @@ Name: libsndfile Version: 1.0.28 -Release: 20 +Release: 21 Summary: Library for reading and writing sound files License: LGPLv2+ and GPLv2+ and BSD URL: http://www.mega-nerd.com/libsndfile/ @@ -23,6 +23,7 @@ Patch6005: libsndfile-1.0.28-CVE-2017-14634.patch Patch6006: libsndfile-1.0.28-CVE-2017-8362.patch Patch6007: backport-CVE-2021-3246.patch Patch6008: backport-CVE-2021-4156.patch +Patch6009: backport-CVE-2022-33065.patch %description Libsndfile is a C library for reading and writing files containing @@ -129,6 +130,11 @@ LD_LIBRARY_PATH=$PWD/src/.libs make check %{_mandir}/man1/sndfile-salvage.1* %changelog +* Thu Dec 21 2023 xuyuchao - 1.0.28-21 +- Type:CVE +- CVE:CVE-2023-33065 +- DESC:fix CVE-2023-33065 + * Mon May 16 2022 zhouwenpei - 1.0.28-20 - fix CVE-2021-4156