mirror of
https://git.yoctoproject.org/poky
synced 2026-05-01 06:32:11 +02:00
284b56a2e2
Added missing commits for complete CVE fix Ref: https://github.com/libsndfile/libsndfile/issues/833 https://ubuntu.com/security/CVE-2022-33065 (From OE-Core rev: fc34dde58e8be19d703479c8e025e27294cdb579) Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
From 590608bbbded2ca0966dc89c5d9b6bf659f4cb71 Mon Sep 17 00:00:00 2001
|
|
From: Alex Stewart <alex.stewart@ni.com>
|
|
Date: Wed, 11 Oct 2023 16:12:22 -0400
|
|
Subject: [PATCH 11/17] mat4/mat5: fix int overflow when calculating blockwidth
|
|
|
|
Pre-cast the components of the blockwidth calculation to sf_count_t to
|
|
avoid overflowing integers during calculation.
|
|
|
|
CVE: CVE-2022-33065
|
|
Fixes: https://github.com/libsndfile/libsndfile/issues/833
|
|
|
|
Signed-off-by: Alex Stewart <alex.stewart@ni.com>
|
|
|
|
Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/libsndfile/tree/debian/patches/CVE-2022-33065/CVE-2022-33065-7.patch?h=ubuntu/jammy-security
|
|
Upstream commit https://github.com/libsndfile/libsndfile/commit/590608bbbded2ca0966dc89c5d9b6bf659f4cb71]
|
|
CVE: CVE-2022-33065
|
|
Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
|
|
---
|
|
src/mat4.c | 2 +-
|
|
src/mat5.c | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/mat4.c b/src/mat4.c
|
|
index 575683ba1..9f046f0c6 100644
|
|
--- a/src/mat4.c
|
|
+++ b/src/mat4.c
|
|
@@ -104,7 +104,7 @@ mat4_open (SF_PRIVATE *psf)
|
|
|
|
psf->container_close = mat4_close ;
|
|
|
|
- psf->blockwidth = psf->bytewidth * psf->sf.channels ;
|
|
+ psf->blockwidth = (sf_count_t) psf->bytewidth * psf->sf.channels ;
|
|
|
|
switch (subformat)
|
|
{ case SF_FORMAT_PCM_16 :
|
|
diff --git a/src/mat5.c b/src/mat5.c
|
|
index da5a6eca0..20f0ea64b 100644
|
|
--- a/src/mat5.c
|
|
+++ b/src/mat5.c
|
|
@@ -114,7 +114,7 @@ mat5_open (SF_PRIVATE *psf)
|
|
|
|
psf->container_close = mat5_close ;
|
|
|
|
- psf->blockwidth = psf->bytewidth * psf->sf.channels ;
|
|
+ psf->blockwidth = (sf_count_t) psf->bytewidth * psf->sf.channels ;
|
|
|
|
switch (subformat)
|
|
{ case SF_FORMAT_PCM_U8 :
|