From patchwork Wed Nov 16 23:32: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: 39297 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp739022pzb; Wed, 16 Nov 2022 15:32:36 -0800 (PST) X-Google-Smtp-Source: AA0mqf5M5zmyMD37YsJgDbO49IJPhq+vohoPV0k8Dx90FQ3/lgPR5Z/7qjXg1v69k6CNEhrfX8S/ X-Received: by 2002:a17:906:17c9:b0:782:fd8e:9298 with SMTP id u9-20020a17090617c900b00782fd8e9298mr47908eje.640.1668641555944; Wed, 16 Nov 2022 15:32:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668641555; cv=none; d=google.com; s=arc-20160816; b=b3gklYUKMWiFL9GK+21jMxnpcYaFioDcRcFD9VAedbQXi/PEdC+UjHvuV9awhLHZ1Y R31aCd2Klub+6w5Y2P01xUl/J7AWmNkZUypQ+Ve0caDLXNpLESYT91ti9F6tjOwHlxg5 p+qS62wXr/uGbrnR5LWXVpeeQi0QQpP5YM6aWKdOUxIdUEEzej2UxEsMbHJ1rJrX/BiV at4G7k99biTfVFAfM8y4AMMVvnDDualFxkZcERJutI8lR/KLJny5sZ0bKmgzSG1oBNJM nlYP0zV8p67ahQWg68TmblbrZ676rdn/mzw6vbMk27gf9O14Uv6hkpyJVqzW4KWu95H+ kTPg== 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:message-id:date:to:from:delivered-to; bh=GtPB/9vwdkVDj5nF2riO+xKAe3KS17IthKP7BcQPiZU=; b=X8AHuHPavrHLFfPcaObnxO2/9IJPs14BQN7F8g2DE+OJQ2RACTFlMgYHghA/abVtwJ AZlI8vWM5muhuiLYvRXaoYTCCFb1+bPprvEVoI0ONdCIy9j2jiU/G/Vxrt7cGSm7yv5g ddGCOE+YzkwsyeUb39f8p9/Ynqv5YocNbs4gO5jOz2yj6btLA2M5PwfYNfkdpxGtAQ8V c07WDIRt7rVfs795R+h/+W9vSdGAvUIo6UsWYpECsWyHBHdXWLvjXw7zphMOVSxAK7VA kmXBwHA2+WfdubezjBhiHXaCVSGKoTDOts2n83/tghUw+51DJtm7G8pj4C18IvSPPUDC 7GwQ== 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 kt11-20020a170906aacb00b0078db89b2566si11153970ejb.699.2022.11.16.15.32.34; Wed, 16 Nov 2022 15:32:35 -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 E666368BB10; Thu, 17 Nov 2022 01:32:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1170C68B71E for ; Thu, 17 Nov 2022 01:32:23 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 98052FF806 for ; Wed, 16 Nov 2022 23:32:21 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 17 Nov 2022 00:32:18 +0100 Message-Id: <20221116233220.5183-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/bonk: Use unsigned in predictor_init_state() to avoid undefined behavior 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: Z64QEjPW5miR Fixes: signed integer overflow: -5010 * -717450 cannot be represented in type 'int' Fixes: 53370/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BONK_fuzzer-4945644204195840 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/bonk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/bonk.c b/libavcodec/bonk.c index ebe8e46d70..df5a80b06e 100644 --- a/libavcodec/bonk.c +++ b/libavcodec/bonk.c @@ -277,10 +277,10 @@ static int predictor_calc_error(int *k, int *state, int order, int error) return x; } -static void predictor_init_state(int *k, int *state, int order) +static void predictor_init_state(int *k, unsigned *state, int order) { for (int i = order - 2; i >= 0; i--) { - int x = state[i]; + unsigned x = state[i]; for (int j = 0, p = i + 1; p < order; j++, p++) { int tmp = x + shift_down(k[j] * state[p], LATTICE_SHIFT); From patchwork Wed Nov 16 23:32:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39298 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp739085pzb; Wed, 16 Nov 2022 15:32:45 -0800 (PST) X-Google-Smtp-Source: AA0mqf5ZhqUuBsqbL6CxY7WUqwtRkQA5yMXcT7KWbJ5d1PyHuJ4+QKxcS2MqPWu+yOLFwQwIk5aA X-Received: by 2002:a05:6402:5517:b0:461:c563:defa with SMTP id fi23-20020a056402551700b00461c563defamr23246edb.72.1668641565363; Wed, 16 Nov 2022 15:32:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668641565; cv=none; d=google.com; s=arc-20160816; b=AUuCwhxA47eEcmqCHJRqSRzu6K7DGkF8N1wSSQgkxSqKL9urotKq6TXKdIID0WDHWu bCweOrVsbvk0zHPpVwAiuFPSTdVFAwpjd5ZU08V9lwP8IeCSz4wn0gIIkyuhE8ymm+SF TyYoFlNmIjHsAcMu7O7XZg634V+R9+VYyens0bEoDj36yTpT8/OKU09kX3jlYIQD+LH0 TqZYcyLXJqQtLXfp5IQugUThQHCDd0EQ4IqvgULy4pmnuzUulwn5tWiLEiCkVyAfFoSn 8vHpO174C/qtl6Id3i/r/dcATx57urN++BPKQ1yGJBZZM9F4cItwvmpPzYt0VkGIzSmS 2ifg== 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=7otXX1aGS91tUNbT3AKlPFSC4t+YhIzEzLmdkx1rHVg=; b=qxWmWpPdcHgTdxy06qu0G/V0/80Ye+r2Yw1EP7Y+nt2qwqlxNsn08VviYTUDeTsSEK nTPAbpRVnqU9HUTm326uziNgsdWLJ95zfVOxtnXjOzJle4gR9YQBYKUPDtBptVvDfiBP 4Y6kC+pqcBRWVXzr2IkWB61RGO9hs5oWJ8oKMM8G3T6AZQQs35pFxZqMT8GOqnx89xtI RjzKvh7FhrlBTQdfWQWzpDkzN9FuTfHoc8cE7JWce/t0ewPWfLzf3doUwCn2Vgcu26SD lrsK4E+kL/X+2tMSOsxWIE69RkHP9w/YOMIFuMAIvn2ySbcyDyn3edfJzNTpm2rAhT50 H1aA== 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 dr8-20020a170907720800b007aef9c62b04si9037496ejc.257.2022.11.16.15.32.45; Wed, 16 Nov 2022 15:32:45 -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 0AB0E68BCC1; Thu, 17 Nov 2022 01:32:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7BE3A68BB10 for ; Thu, 17 Nov 2022 01:32:23 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 99C5560003 for ; Wed, 16 Nov 2022 23:32:22 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 17 Nov 2022 00:32:19 +0100 Message-Id: <20221116233220.5183-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221116233220.5183-1-michael@niedermayer.cc> References: <20221116233220.5183-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/apac: reset buffer on error 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: HtkDkRMzZBYB Fixes: repeatly parsing the same data after each 1 byte packet Fixes: Timeout Fixes: 51943/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APAC_fuzzer-5779018251370496 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/apac.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/apac.c b/libavcodec/apac.c index 6a1f61b842..e9f6a0dd88 100644 --- a/libavcodec/apac.c +++ b/libavcodec/apac.c @@ -191,6 +191,8 @@ static int apac_decode(AVCodecContext *avctx, AVFrame *frame, if (c->bit_length < 0 || c->bit_length > 17) { c->bit_length = avctx->bits_per_coded_sample; + s->bitstream_index = 0; + s->bitstream_size = 0; return AVERROR_INVALIDDATA; } From patchwork Wed Nov 16 23:32:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39299 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp739144pzb; Wed, 16 Nov 2022 15:32:53 -0800 (PST) X-Google-Smtp-Source: AA0mqf66tf9id3urldoy0O+SQ1wc0/W5MEYoSAJW5KkNfTsymNbMITixN2sRThaInjnIGSFSI3tW X-Received: by 2002:a17:906:64d:b0:78d:e4c6:2c8b with SMTP id t13-20020a170906064d00b0078de4c62c8bmr98401ejb.164.1668641573556; Wed, 16 Nov 2022 15:32:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668641573; cv=none; d=google.com; s=arc-20160816; b=Wf3ukQGXJv33HwVTI257k7EqCoo+JVyu4To6tjAkm5uhBiiUCKwCA3rdxuu3usxS0g pp+GRhKhbJS1YFxM5k51UlUW8ggD0ymO8TeCgwIY5a8gOujvFZV2dqiuZqqFxxA62CWd 5fEnykOZGr0NeVxtzO7dPCSIhw9COLutd4s/krZ6DDpxPYkj7QIwH0+zqN9s0+ulWIin +W/NNyWTFq7TBoFEpOsuZREwNtNOY3XBzVNLeQdzrtfIAcsfMUkDoIMN6gTCUXqAe9AJ 05I7P56O0SlWNuKWrADlXcxOazYeIR8dhFW3U5f1A6Q8r/TIXPwYldD1kK7pmROYWs9G YJiA== 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=FR8uqt88lxYKXC9eD7oAHAjOyIMrlugOdwWFpe6Vq+k=; b=00JwD+T+l5wO8RivC1vKrn0T81eucx3BEwSCU+70w92dTrc+HFeoUGz54SuVKvQzUr Vq1kOXvs/Q/imKwLMFebzxtODAprZOMQ949R6j/6kuARLbvo4joJc0rVkPhyLGjB2BVB b+/sVGJk3ue31CE7DSkjJgIrZEPnBy2DBXXKbEtdV3bhb/FmOst594AVcXxOvm0nV+tM cHB3JkMicKhn60IBNSBM4ZzlIfIcCIs1lFiecKOUC2BKOwU1XjPG39g/dwmQ2gdF/2eB JpTFNrDaN2sQVckPeuOVG2zRFkvwFaA6mNL1vHMWAKg/YjnHYZRs1TWmrtNE1ra0YdrB /8aA== 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 h11-20020a05640250cb00b0046786a5845bsi13399552edb.567.2022.11.16.15.32.53; Wed, 16 Nov 2022 15:32:53 -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 16FC768BD18; Thu, 17 Nov 2022 01:32:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1118968BB10 for ; Thu, 17 Nov 2022 01:32:24 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 6904D60005 for ; Wed, 16 Nov 2022 23:32:23 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 17 Nov 2022 00:32:20 +0100 Message-Id: <20221116233220.5183-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221116233220.5183-1-michael@niedermayer.cc> References: <20221116233220.5183-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/apac: use unsigned for sample residual 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: x9aP/AWyT2hN Fixes: signed integer overflow: -2146670226 + -2227242 cannot be represented in type 'int' Fixes: 51943/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APAC_fuzzer-5779018251370496 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/apac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/apac.c b/libavcodec/apac.c index e9f6a0dd88..72ff41bdbb 100644 --- a/libavcodec/apac.c +++ b/libavcodec/apac.c @@ -204,7 +204,7 @@ static int apac_decode(AVCodecContext *avctx, AVFrame *frame, for (int i = 0; i < c->block_length; i++) { int val = get_bits_long(gb, c->bit_length); - int delta = (val & 1) ? ~(val >> 1) : (val >> 1); + unsigned delta = (val & 1) ? ~(val >> 1) : (val >> 1); int sample; delta += c->last_delta;