initial buildroot for linux 5.15
This commit is contained in:
@@ -0,0 +1,40 @@
|
||||
From deb669ee8be55a94565f6f8a6b60890c2e7c6f32 Mon Sep 17 00:00:00 2001
|
||||
From: bobsayshilol <bobsayshilol@live.co.uk>
|
||||
Date: Thu, 18 Feb 2021 21:52:09 +0000
|
||||
Subject: [PATCH] ms_adpcm: Fix and extend size checks
|
||||
|
||||
'blockalign' is the size of a block, and each block contains 7 samples
|
||||
per channel as part of the preamble, so check against 'samplesperblock'
|
||||
rather than 'blockalign'. Also add an additional check that the block
|
||||
is big enough to hold the samples it claims to hold.
|
||||
|
||||
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=26803
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
src/ms_adpcm.c | 10 ++++++++--
|
||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/ms_adpcm.c b/src/ms_adpcm.c
|
||||
index 5e8f1a31..a21cb994 100644
|
||||
--- a/src/ms_adpcm.c
|
||||
+++ b/src/ms_adpcm.c
|
||||
@@ -128,8 +128,14 @@ wavlike_msadpcm_init (SF_PRIVATE *psf, int blockalign, int samplesperblock)
|
||||
if (psf->file.mode == SFM_WRITE)
|
||||
samplesperblock = 2 + 2 * (blockalign - 7 * psf->sf.channels) / psf->sf.channels ;
|
||||
|
||||
- if (blockalign < 7 * psf->sf.channels)
|
||||
- { psf_log_printf (psf, "*** Error blockalign (%d) should be > %d.\n", blockalign, 7 * psf->sf.channels) ;
|
||||
+ /* There's 7 samples per channel in the preamble of each block */
|
||||
+ if (samplesperblock < 7 * psf->sf.channels)
|
||||
+ { psf_log_printf (psf, "*** Error samplesperblock (%d) should be >= %d.\n", samplesperblock, 7 * psf->sf.channels) ;
|
||||
+ return SFE_INTERNAL ;
|
||||
+ } ;
|
||||
+
|
||||
+ if (2 * blockalign < samplesperblock * psf->sf.channels)
|
||||
+ { psf_log_printf (psf, "*** Error blockalign (%d) should be >= %d.\n", blockalign, samplesperblock * psf->sf.channels / 2) ;
|
||||
return SFE_INTERNAL ;
|
||||
} ;
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
config BR2_PACKAGE_LIBSNDFILE
|
||||
bool "libsndfile"
|
||||
help
|
||||
Libsndfile is a C library for reading and writing files
|
||||
containing sampled sound (such as MS Windows WAV and the
|
||||
Apple/SGI AIFF format) through one standard library interface.
|
||||
|
||||
http://www.mega-nerd.com/libsndfile/
|
||||
@@ -0,0 +1,4 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 a8cfb1c09ea6e90eff4ca87322d4168cdbe5035cb48717b40bf77e751cc02163 libsndfile-1.0.31.tar.bz2
|
||||
# Locally calculated
|
||||
sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING
|
||||
@@ -0,0 +1,34 @@
|
||||
################################################################################
|
||||
#
|
||||
# libsndfile
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBSNDFILE_VERSION = 1.0.31
|
||||
LIBSNDFILE_SOURCE = libsndfile-$(LIBSNDFILE_VERSION).tar.bz2
|
||||
LIBSNDFILE_SITE = https://github.com/libsndfile/libsndfile/releases/download/$(LIBSNDFILE_VERSION)
|
||||
LIBSNDFILE_INSTALL_STAGING = YES
|
||||
LIBSNDFILE_LICENSE = LGPL-2.1+
|
||||
LIBSNDFILE_LICENSE_FILES = COPYING
|
||||
LIBSNDFILE_CPE_ID_VENDOR = libsndfile_project
|
||||
|
||||
# 0001-ms_adpcm-Fix-and-extend-size-checks.patch
|
||||
LIBSNDFILE_IGNORE_CVES += CVE-2021-3246
|
||||
|
||||
# disputed, https://github.com/erikd/libsndfile/issues/398
|
||||
LIBSNDFILE_IGNORE_CVES += CVE-2018-13419
|
||||
|
||||
LIBSNDFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
|
||||
LIBSNDFILE_CONF_OPTS = \
|
||||
--disable-sqlite \
|
||||
--disable-alsa \
|
||||
--disable-full-suite
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FLAC)$(BR2_PACKAGE_LIBVORBIS)$(BR2_PACKAGE_OPUS),yyy)
|
||||
LIBSNDFILE_DEPENDENCIES += flac host-pkgconf libvorbis opus
|
||||
LIBSNDFILE_CONF_OPTS += --enable-external-libs
|
||||
else
|
||||
LIBSNDFILE_CONF_OPTS += --disable-external-libs
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user