From owner-dev-commits-ports-all@freebsd.org Sat May 8 17:00:15 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CE624639FD9; Sat, 8 May 2021 17:00:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fctq35XGbz3KKN; Sat, 8 May 2021 17:00:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B0D4922417; Sat, 8 May 2021 17:00:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 148H0FNE067410; Sat, 8 May 2021 17:00:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 148H0FIZ067404; Sat, 8 May 2021 17:00:15 GMT (envelope-from git) Date: Sat, 8 May 2021 17:00:15 GMT Message-Id: <202105081700.148H0FIZ067404@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christian Weisgerber Subject: git: 3984e6561a7e - main - audio/flac: Fix out-of-bounds read MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: naddy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3984e6561a7ee7383c502456ae27ce48ee28a028 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 May 2021 17:00:15 -0000 The branch main has been updated by naddy: URL: https://cgit.FreeBSD.org/ports/commit/?id=3984e6561a7ee7383c502456ae27ce48ee28a028 commit 3984e6561a7ee7383c502456ae27ce48ee28a028 Author: Christian Weisgerber AuthorDate: 2021-05-08 16:56:07 +0000 Commit: Christian Weisgerber CommitDate: 2021-05-08 17:00:04 +0000 audio/flac: Fix out-of-bounds read Obtained from: https://github.com/xiph/flac/commit/2e7931c27eb15e387da440a37f12437e35b22dd4 Security: 49346de2-b015-11eb-9bdf-f8b156b6dcc8 Security: CVE-2020-0499 --- audio/flac/Makefile | 1 + audio/flac/files/patch-src_libFLAC_bitreader.c | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/audio/flac/Makefile b/audio/flac/Makefile index b3b04c9c9645..7ff50f5804a5 100644 --- a/audio/flac/Makefile +++ b/audio/flac/Makefile @@ -2,6 +2,7 @@ PORTNAME= flac PORTVERSION= 1.3.3 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= https://downloads.xiph.org/releases/flac/ diff --git a/audio/flac/files/patch-src_libFLAC_bitreader.c b/audio/flac/files/patch-src_libFLAC_bitreader.c new file mode 100644 index 000000000000..463343e0d428 --- /dev/null +++ b/audio/flac/files/patch-src_libFLAC_bitreader.c @@ -0,0 +1,13 @@ +https://github.com/xiph/flac/commit/2e7931c27eb15e387da440a37f12437e35b22dd4 + +--- src/libFLAC/bitreader.c.orig 2021-05-08 16:06:17 UTC ++++ src/libFLAC/bitreader.c +@@ -864,7 +864,7 @@ incomplete_lsbs: + cwords = br->consumed_words; + words = br->words; + ucbits = FLAC__BITS_PER_WORD - br->consumed_bits; +- b = br->buffer[cwords] << br->consumed_bits; ++ b = cwords < br->capacity ? br->buffer[cwords] << br->consumed_bits : 0; + } while(cwords >= words && val < end); + } +