From patchwork Sat Nov 5 20:16:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39182 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1198779pzb; Sat, 5 Nov 2022 13:16:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7xHSaRxztxXLkzDWl4jUv4l57YVE+o4UvsGR5o8trwBaYpJ99H1Eru20SMOjbJLta3L6xM X-Received: by 2002:a17:907:3f25:b0:7ae:319c:90b2 with SMTP id hq37-20020a1709073f2500b007ae319c90b2mr9647396ejc.515.1667679419049; Sat, 05 Nov 2022 13:16:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667679419; cv=none; d=google.com; s=arc-20160816; b=ZJkDD9p5xzQ4H+4ifGJngtV+xo4OGvoDZAnXpuLdsJFAMJQrqYj5X06hpCjYPYLuyj LqH0m10UsiiidBUQpdWG1tPlr3Cl+D5YOseKQGBjWKcQFEVOommUTOF/GX4JpntT6lNy /nDeG5BNRkPeAoQnm6EXVso0dAJcvhEuEQSD0UAxPEQEshdu0TxkFflDxCDFuyndMKBH B1OddM1+Qit08BhZJewxuWziops+AC02qRWEybs2SyUNG8TXJhYQGpRExTjsa2bdMpIW ymUcorzS+7zvuTfKVfpPUyFhi7rAkX+yfPVMEoEo4rM4wSNeA+JtDNLEYv8vu7PnzoAE IKZA== 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=4jSeYRdJY7rTI1YWtM/1nAfIC1xIqXj/9lZyxgvlC2M=; b=gN+YiXSKOv9X1YRbbqViED+CgbJrBU6tozzYt4LyOMT8hmU0SlNXR86S/GE+Sv9VPN h/37kaysFTPXh4e18rG42rzL6RxpOTHN8qTJXcuoIniEBt+GJRoUeJqgWZ2ABYUottez v3v+lz47iWJPh5HW//eaGPJK1b7c9eQtVLvgA6QW1NoXhYKhMGwTW9qKLxxgqQLIk60e Kf61UEEAxfGKClWD8V/E/IpUgwiYSpgno1+cHXmZOp+9h6/SQX5/QgoPVVlMwwBfUYcB BISU7ap8ttCLOM7oTFO9KlusjdTDdfCYssYRKqYX/iu5VFp0WbDtUN10UNCQ6gbtuHUh trww== 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 b19-20020a50ccd3000000b004549b880c67si3326668edj.42.2022.11.05.13.16.58; Sat, 05 Nov 2022 13:16:59 -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 035DD68B244; Sat, 5 Nov 2022 22:16:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4048168B1CE for ; Sat, 5 Nov 2022 22:16:36 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 31ADF240007 for ; Sat, 5 Nov 2022 20:16:34 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 5 Nov 2022 21:16:28 +0100 Message-Id: <20221105201629.1980-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221105201629.1980-1-michael@niedermayer.cc> References: <20221105201629.1980-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/bonk: Check unquant for overflow 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: 8vMqKp7+ZMi6 Fixes: signed integer overflow: -2889074 * 2048 cannot be represented in type 'int' Fixes: 51363/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BONK_fuzzer-5660734784143360 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/bonk.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/bonk.c b/libavcodec/bonk.c index 471e09fe14..1695229dbd 100644 --- a/libavcodec/bonk.c +++ b/libavcodec/bonk.c @@ -363,12 +363,17 @@ static int bonk_decode(AVCodecContext *avctx, AVFrame *frame, return ret; for (int i = 0; i < samples_per_packet; i++) { + int64_t t64; for (int j = 0; j < s->down_sampling - 1; j++) { sample[0] = predictor_calc_error(s->k, state, s->n_taps, 0); sample++; } - sample[0] = predictor_calc_error(s->k, state, s->n_taps, s->input_samples[i] * quant); + t64 = s->input_samples[i] * (int64_t)quant; + if ((int32_t)t64 != t64) + return AVERROR_INVALIDDATA; + + sample[0] = predictor_calc_error(s->k, state, s->n_taps, t64); sample++; }