From patchwork Wed Jan 11 20:42:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39977 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp5038064pzb; Wed, 11 Jan 2023 12:43:10 -0800 (PST) X-Google-Smtp-Source: AMrXdXsSR3yX8V+5lTKXbZvth9FIyg1VgEK0iinGW7RLsiKaULJSxzk2Ygfze8nuv7slSxAEbYlF X-Received: by 2002:a05:6402:548f:b0:49b:57f6:d9a with SMTP id fg15-20020a056402548f00b0049b57f60d9amr563287edb.21.1673469789864; Wed, 11 Jan 2023 12:43:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673469789; cv=none; d=google.com; s=arc-20160816; b=UShnpxvxIc1KS1pqDOwQ+EP9fM13wwSX3ZlVr3SgQ/xILAE41TTKebEYwLL1NFQTih Iwb+AXztvohYDTgUhEbFLGLdgE7Xecn6HGReF3PPdXqt6lOnSXuEx1bE2BAS4kXglaoI jXjyC4DyfCxSXIMYIR3Sw3Xo2JF08WxB65LzCpBqqClBkOdAV+uNrkHwwrRtYNMMmw0D kocPs0nRxIag+KB5Bbk3mXnjmoQan1o08caGsC092QxHAoSgQj8967CI4O8Bfh6ZPIc9 HHXTmMJy6U/QUdHrknTHV+LjivMSO0pBm8cDeURCi4js9QZ9bjQHarAx2mAhh+fWaXdB CnIg== 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=LEZLrIog9ds677bbQOOh5f+Oxigg+sGyFEw8ZSgGE1I=; b=PRwPvg9Ph1aDqmf+PtFPp7lQc7TxKydi7MfZ8hecLNJs6OYDzjs/9p7MarPAtwyISJ RKSWAj40YKhYq3RZ6vZqKkfLNFW9IUZsKYxno5xrLDJm5v7hxUzR8QsPoqo3anU4HlMx qrTaIrt2OXHYdpkNRKZhDhGewdiUNJCmbHN2DTkGDPCI7Htp6ZJJmgM3XTbzYXuc4tpi Mkk98pk+uq1wNTs+JSRtlOmzSWgLUKXcWFGZGbuNf6ejc8X548zgYnSRP3BRw7NyZccl avRQFaE2nZ4ZPIcezvSXOE2ALcHBayDZ35GhuoVYGt9nscNeS2+hH3zAqvDd8aTiZ3Am lb8Q== 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 p11-20020a056402500b00b004948ab74664si15317299eda.106.2023.01.11.12.43.09; Wed, 11 Jan 2023 12:43:09 -0800 (PST) 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 9417768BD60; Wed, 11 Jan 2023 22:42:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 63D8C68BD6E for ; Wed, 11 Jan 2023 22:42:36 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 99CA11C0005 for ; Wed, 11 Jan 2023 20:42:35 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 11 Jan 2023 21:42:20 +0100 Message-Id: <20230111204221.22550-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230111204221.22550-1-michael@niedermayer.cc> References: <20230111204221.22550-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/bonk: Avoid undefined overflow in quant 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: 1pnQQ5JgNsy0 Fixes: signed integer overflow: -2889074 * 2048 cannot be represented in type 'int' Fixes: 51363/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BONK_fuzzer-5660734784143360 Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BONK_fuzzer-6617680050520064 Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BONK_fuzzer-6743951854141440 No check is done for the overflow as this was rejected in last review, see the ML Note: the 2nd and 3rd testcase was assigned by ossfuzz to a unrelated theora issue (48567) Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/bonk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/bonk.c b/libavcodec/bonk.c index 5d736b1563..9e176d5477 100644 --- a/libavcodec/bonk.c +++ b/libavcodec/bonk.c @@ -356,7 +356,7 @@ static int bonk_decode(AVCodecContext *avctx, AVFrame *frame, sample++; } - sample[0] = predictor_calc_error(s->k, state, s->n_taps, s->input_samples[i] * quant); + sample[0] = predictor_calc_error(s->k, state, s->n_taps, s->input_samples[i] * (unsigned)quant); sample++; }