Skip to contentSkip to conversation

package/faad2: bump to version 2.9.1

PATCH New Fabrice Fontaine 2 participants 2 messages Jan 12, 2020 – Jan 13, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/faad2: bump to version 2.9.1

- Switch site to github to get latest release
- Remove all patches (already in version)

---
 ...k-for-syntax-element-inconsistencies.patch | 64 -----------------
 ...fadj-sanitize-frequency-band-borders.patch | 71 -------------------
 .../0003-Fix-a-couple-buffer-overflows.patch  | 50 -------------
 ...prevent-crash-on-SCE-followed-by-CPE.patch | 54 --------------
 package/faad2/faad2.hash                      |  5 +-
 package/faad2/faad2.mk                        |  7 +-
 6 files changed, 5 insertions(+), 246 deletions(-)
 delete mode 100644 package/faad2/0001-syntax.c-check-for-syntax-element-inconsistencies.patch
 delete mode 100644 package/faad2/0002-sbr_hfadj-sanitize-frequency-band-borders.patch
 delete mode 100644 package/faad2/0003-Fix-a-couple-buffer-overflows.patch
 delete mode 100644 package/faad2/0004-add-patch-to-prevent-crash-on-SCE-followed-by-CPE.patch
package/faad2/0001-syntax.c-check-for-syntax-element-inconsistencies.patch deleted +0 -64
deleted file mode 100644
index de97dbbaf0..0000000000
@@ -1,64 +0,0 @@
-From 466b01d504d7e45f1e9169ac90b3e34ab94aed14 Mon Sep 17 00:00:00 2001
-From: Hugo Lefeuvre <[email protected]>
-Date: Mon, 25 Feb 2019 10:49:03 +0100
-Subject: [PATCH] syntax.c: check for syntax element inconsistencies
-
-Implicit channel mapping reconfiguration is explicitely forbidden by
-ISO/IEC 13818-7:2006 (8.5.3.3). Decoders should be able to detect such
-files and reject them. FAAD2 does not perform any kind of checks
-regarding this.
-
-This leads to security vulnerabilities when processing crafted AAC
-files performing such reconfigurations.
-
-Add checks to decode_sce_lfe and decode_cpe to make sure such
-inconsistencies are detected as early as possible.
-
-These checks first read hDecoder->frame: if this is not the first
-frame then we make sure that the syntax element at the same position
-in the previous frame also had element_id id_syn_ele. If not, return
-21 as this is a fatal file structure issue.
-
-This patch addresses CVE-2018-20362 (fixes #26) and possibly other
-related issues.
-
-Signed-off-by: Baruch Siach <[email protected]>
----
-Upstream status: commit 466b01d504d7
-
- libfaad/syntax.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/libfaad/syntax.c b/libfaad/syntax.c
-index f8e808c269c0..e7fb11381e46 100644
---- a/libfaad/syntax.c
-+++ b/libfaad/syntax.c
-@@ -344,6 +344,12 @@ static void decode_sce_lfe(NeAACDecStruct *hDecoder,
-        can become 2 when some form of Parametric Stereo coding is used
-     */
- 
-+    if (hDecoder->frame && hDecoder->element_id[hDecoder->fr_ch_ele] != id_syn_ele) {
-+        /* element inconsistency */
-+        hInfo->error = 21;
-+        return;
-+    }
-+
-     /* save the syntax element id */
-     hDecoder->element_id[hDecoder->fr_ch_ele] = id_syn_ele;
- 
-@@ -395,6 +401,12 @@ static void decode_cpe(NeAACDecStruct *hDecoder, NeAACDecFrameInfo *hInfo, bitfi
-         return;
-     }
- 
-+    if (hDecoder->frame && hDecoder->element_id[hDecoder->fr_ch_ele] != id_syn_ele) {
-+        /* element inconsistency */
-+        hInfo->error = 21;
-+        return;
-+    }
-+
-     /* save the syntax element id */
-     hDecoder->element_id[hDecoder->fr_ch_ele] = id_syn_ele;
- 
--- 
-2.20.1
-
package/faad2/0002-sbr_hfadj-sanitize-frequency-band-borders.patch deleted +0 -71

71 lines not on this page · raw message

package/faad2/0003-Fix-a-couple-buffer-overflows.patch deleted +0 -50

50 lines not on this page · raw message

package/faad2/0004-add-patch-to-prevent-crash-on-SCE-followed-by-CPE.patch deleted +0 -54

54 lines not on this page · raw message

package/faad2/faad2.hash +1 -4
index 2c6acee3d7..1a03bc9b7b 100644
@@ -1,6 +1,3 @@
-# From http://sourceforge.net/projects/faac/files/faad2-src/faad2-2.8.0/ (used by upstream):
-md5	28f6116efdbe9378269f8a6221767d1f  faad2-2.8.8.tar.gz
-sha1	0d49c516d4a83c39053a9bd214fddba72cbc34ad  faad2-2.8.8.tar.gz
 # Locally computed
-sha256  985c3fadb9789d2815e50f4ff714511c79c2710ac27a4aaaf5c0c2662141426d  faad2-2.8.8.tar.gz
+sha256  7fa33cff76abdda5a220ca5de0b2e05a77354f3b97f735193c2940224898aa9a  faad2-2.9.1.tar.gz
 sha256  d3baf3a54943cf12a994c85867a18dec84f810901b2f2878ddfd77efcc3c150f  COPYING
package/faad2/faad2.mk +4 -3
index 27daadfc12..9ec9d8f52c 100644
@@ -4,13 +4,14 @@
 #
 ################################################################################
 
-FAAD2_VERSION_MAJOR = 2.8
-FAAD2_VERSION = $(FAAD2_VERSION_MAJOR).8
-FAAD2_SITE = http://downloads.sourceforge.net/project/faac/faad2-src/faad2-$(FAAD2_VERSION_MAJOR).0
+FAAD2_VERSION = 2.9.1
+FAAD2_SITE = $(call github,knik0,faad2,$(subst .,_,$(FAAD2_VERSION)))
 FAAD2_LICENSE = GPL-2.0
 FAAD2_LICENSE_FILES = COPYING
 # frontend/faad calls frexp()
 FAAD2_CONF_ENV = LIBS=-lm
 FAAD2_INSTALL_STAGING = YES
+# From git
+FAAD2_AUTORECONF = YES
 
 $(eval $(autotools-package))
Signature · 1 line
2.24.1
#1 lore raw

PATCH 1/1 package/faad2: bump to version 2.9.1

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

- Switch site to github to get latest release
- Remove all patches (already in version)

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard