From patchwork Sun Sep 11 14:27:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37847 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1995989pzh; Sun, 11 Sep 2022 07:28:27 -0700 (PDT) X-Google-Smtp-Source: AA6agR4/3sp4+vvZ3jBUqtzVjattQfwsnb6jl6vC++giqcfnwBTPwHcWykW30/w2ZRTMJnpyIvOn X-Received: by 2002:a17:907:3f04:b0:741:4bf4:fe42 with SMTP id hq4-20020a1709073f0400b007414bf4fe42mr16398999ejc.664.1662906506798; Sun, 11 Sep 2022 07:28:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662906506; cv=none; d=google.com; s=arc-20160816; b=yXTHhxKNf+TgHOlVDEVRHygtPWIecpKGXnKtabJyMa6WOt+CJ4bGi5bx5a0bXX+PKG N3rF8124ytEEzUJTuJXuIwWfuKelsj4MchCdafCNfxcjOU/K6BpYAaKFq/WAUKh6vqtC DNSFWnQWw8iFaazPuYCrltU/7XM3hDo33DqpblV65Y94nsAGYEvokIVAk61ff9OCg1Hc wxW7Hfmrb83zttg42dGUup7MnXfFUmp1ZT3tWF8/C36YER7u7jvpafi+K8eoZ9bgbfzV UFQDF+5z7ElFHraVUkRbTqpToON8xJhW7nRScBAKHyCyCylYPmr7rUJkQKkNq/E/+ZJu ct0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=SXB/ckfevUp137brsDFPUHyUtLyqmMrAueq0eZ7ThtM=; b=lqEh1+ngvHnVn+oSbWKdk1u6IomWO3/hzbcNZkV7/CT1ciyNBiDujVK6VIo1RlgNcP Quwhy5tbPAXXiwwrNSCNIMYn8+asUFvRpj2HpQ6h3cNYJWEeecjX7HPWV0i9iqDpluo2 HrX7i5dIRktnOpUjrnUnOTXlRmfa/aI3R0AhniPICKMMeXJ19RpdwJzuHAzuZe1FnHBk MZNWBwgauwEuH78I5Cf9zf29NFCMOCZfL5r8aXpONmhIDatvtjcOC1BGtxXZFjHuVFC1 k+hxVvVlMynEuPmxYC7boHm2K8yx5v5mTcgg59eEwfZup2kWvVHa3NBwCZ3QWPk/z0iB zskQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b30-20020a509f21000000b0044ec8f9905asi5201728edf.403.2022.09.11.07.28.26; Sun, 11 Sep 2022 07:28:26 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 30D7468BB0F; Sun, 11 Sep 2022 17:28:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B45C68BAA9 for ; Sun, 11 Sep 2022 17:28:22 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oXNwc-002kSq-1k for ffmpeg-devel@ffmpeg.org; Sun, 11 Sep 2022 16:28:22 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id XNwLoQEVi8s8UXNwcoqehy; Sun, 11 Sep 2022 16:28:22 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id XNveod9zW8eSWXNveoJM6C; Sun, 11 Sep 2022 16:27:22 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=631df04a a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=hO1aMa3koIp_T9N3F1kA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 11 Sep 2022 16:27:18 +0200 Message-Id: <20220911142721.30812-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220911142721.30812-1-michael@niedermayer.cc> References: <20220911142721.30812-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfLTxZBDkOYwbK/eUIPE4LnnZ1f4KLAnTjgvDKW/OP6KCN/TdOX8v3BB0qbq3ithmgYOL8fEgh3pbb7XCmXDcmVGfQIX7A16JWsCBsWCzJIUOz/qmC/Nq r+cggJqN+ij2cRERf3BxyyPIdtg34lwmmT3S1W8qRuahlhexsTUsY4+iuDA2wmnuJxmlkedGe3pXLg== Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/wavpack: Fix overflow in k=31 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RtB489APPl1e Untested with "non fuzzed" samples as i have no such file Fixes: shift exponent 32 is too large for 32-bit type 'int' Fixes: 50930/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVPACK_fuzzer-6319201949712384 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/wavpack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 7aa1f65e17b..b4d19df7ea2 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -126,7 +126,7 @@ static av_always_inline unsigned get_tail(GetBitContext *gb, unsigned k) if (k < 1) return 0; p = av_log2(k); - e = (1 << (p + 1)) - k - 1; + e = (1LL << (p + 1)) - k - 1; res = get_bits_long(gb, p); if (res >= e) res = (res << 1) - e + get_bits1(gb);