From patchwork Wed Sep 13 23:47:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 43725 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4b2f:b0:149:dfde:5c0a with SMTP id fp47csp58274pzb; Wed, 13 Sep 2023 16:47:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG4BaOu52lMQjeUCBfgsdK6Yai672U6AwE3bduGNHUi+fp//6elg/yHWlt1O2zmkEJoai5s X-Received: by 2002:aa7:c147:0:b0:523:d51:bb2 with SMTP id r7-20020aa7c147000000b005230d510bb2mr3389849edp.15.1694648868020; Wed, 13 Sep 2023 16:47:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694648868; cv=none; d=google.com; s=arc-20160816; b=WnWm2obGnMGrUlKVqiyiqjAYJzwFpWH39xPQ0pXx7tlNHoLKrmNWcscqlBGY15gMzF cjlZCvNV5tFolhrs3yZ/9kmCgD4f/r/Yc1R2pYHo0gKGdnzNUJRgqrhCqxhAylQYlZPh ImOe41ZfvFI+/UQ/SmxUqz4nVWkHHqn/AXmAiq6fenJQjtnQHPAlKMXiq5wN2EyallnG yQKN5MBUss4yV4MJRg1pZTLJgkOM6qzhNpYtNZxXnKF0eT8O7T9BH6expezGln8lmyZz iXgQjOMZlP0wBq0OHWMXMD5b9TafHmWDdTK5BlTF623EQgCHC8Ow56nEl4pmk5PAZB4V mqlg== 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=2CjurnSYgxSSuEw22fnL4VYifCEdAI+O8AUHZWZy6UY=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Wa17YQbDQiZTo2jFr2bijAcykYUk1TR4TGjPQi8M0wTvbHZNrITAF3J87f1ZXMXoIm D56XRzYMb94a8hm95+zxcXNCwPCF2MEdAWmORtEKRH6AY9wjXzBqUnLQkplu0FdKezUt HNCptkFrVUqbOPysCpSPNHXbADap2q/grbTT/4OSzZzPdd0GOb/EEaU0CTCzpTtSUwWa P++3NeiKtLFFfzlkMgt+3cj/ebMwrOcf2waFj+3oZ36tfNrIR7gYxiTVaejtR0nHgIMw Djb3dey1YZqPc8DfK8ukBaPY8f/YwFcGxpvnVgHBfFhg72Bkt79svNTobFtbFXWkzUsc Ae4w== 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 u7-20020a05640207c700b0052c8babd80dsi242139edy.596.2023.09.13.16.47.47; Wed, 13 Sep 2023 16:47:48 -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 8AD4F68C8CA; Thu, 14 Sep 2023 02:47:43 +0300 (EEST) 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 BDB2E68C948 for ; Thu, 14 Sep 2023 02:47:36 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id BE403FF803 for ; Wed, 13 Sep 2023 23:47:35 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 14 Sep 2023 01:47:32 +0200 Message-Id: <20230913234734.22402-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/3] tools/target_dec_fuzzer: Adjust threshold for MVHA 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: RijsuXa5ZgkH Fixes: Timeout Fixes: 62120/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MVHA_fuzzer-5647877768347648 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- tools/target_dec_fuzzer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index c3f88ef49f6..8e66f378462 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -261,6 +261,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { case AV_CODEC_ID_MSZH: maxpixels /= 128; break; case AV_CODEC_ID_MTS2: maxpixels /= 4096; break; case AV_CODEC_ID_MVC2: maxpixels /= 128; break; + case AV_CODEC_ID_MVHA: maxpixels /= 16384; break; case AV_CODEC_ID_MVDV: maxpixels /= 1024; break; case AV_CODEC_ID_MWSC: maxpixels /= 256; break; case AV_CODEC_ID_MXPEG: maxpixels /= 128; break; From patchwork Wed Sep 13 23:47:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 43726 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4b2f:b0:149:dfde:5c0a with SMTP id fp47csp58341pzb; Wed, 13 Sep 2023 16:48:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHpc36RoQ3stx6hH/MkotIlfPEEn2a3ePcPDmEoXIH/CKxAzJNN8tICHEsupRGpMj/RkeEt X-Received: by 2002:a17:906:1d:b0:9a9:d5d1:35a4 with SMTP id 29-20020a170906001d00b009a9d5d135a4mr301490eja.7.1694648879784; Wed, 13 Sep 2023 16:47:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694648879; cv=none; d=google.com; s=arc-20160816; b=liojuv52DGAq8PugEJaiQXL6jvbSNS9fio/ZE6XDFSXs3yF7EfMih0SKTVDUul5f/c 5MOnp3z4rZNCyFhPFZn4xLUDY5ocOG8mM4FaVr+b840SICGXdFFOAj5L9Y7JJfWqJyyL tEIM1yZXl6jSQdVdPE6JYPz3faR1COSc3kGnB80JHll4vWwGyVq37Rccv0aNRZxyWo6h 2txvD3+Pr6LKZbrnmzOj/bbQAwiUBThlR/SYvn3GrxAAuN5s5upTW2yNmqGGGrmSL8kS yO/J1pTKtmwAmJ7apLNhg2eXj5f8W6G5CrlgqSenJ1ivRGGJ3F7ehsir8AN2hA5rtPvr Oa0A== 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=scHAQTzai/IYz3XN84SPbYzDLJI9ZU0R0VFI+Fq4bpM=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=NBgNamYpRVfn+WBsVuMk4mDxn0ATZYujyKcR+g5OLfJ7qitr4D5oEZ95qrZ4RecuAy BQAbUcBW/2LNJkr/Pyf1MAtdTxVTHFo6Ox8x4P12K6ngsL0RChId8xljEIRcbO3dAGWj INg3jBYP/xeqV8I8zPpwaOV1zxktZZd85hGpZwH+SgZQ6uQXOsnOTeOcvolQ8xEs1Dze nyucZC0TcZGQ47CMwAexprLrvvYH3nmjphwgjwx8oqVKx+n1CITWmmpZSfhUEd2r2LfW 5sZOp7rbi39fdvSaDO9/dvEQUDqMDrzY3oBVmz1Y7Vt4H4yU3eRhzRg+0zX6/TIox/NB n7Lg== 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 um10-20020a170906cf8a00b009a205e2e6e3si226515ejb.231.2023.09.13.16.47.59; Wed, 13 Sep 2023 16:47: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 CD1AA68CA06; Thu, 14 Sep 2023 02:47:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B7AEA68C9AF for ; Thu, 14 Sep 2023 02:47:37 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id EEEA520002 for ; Wed, 13 Sep 2023 23:47:36 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 14 Sep 2023 01:47:33 +0200 Message-Id: <20230913234734.22402-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230913234734.22402-1-michael@niedermayer.cc> References: <20230913234734.22402-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/vlc: Attempt to free buf after use in ff_vlc_init_multi_from_lengths() 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: 2/3iRxiISELi Fixes: use after free Fixes: 62153/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MAGICYUV_fuzzer-4702814909366272 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vlc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/vlc.c b/libavcodec/vlc.c index b353d2e86c2..f4bab0ae529 100644 --- a/libavcodec/vlc.c +++ b/libavcodec/vlc.c @@ -471,10 +471,13 @@ int ff_vlc_init_multi_from_lengths(VLC *vlc, VLC_MULTI *multi, int nb_bits, int goto fail; } } - ret = vlc_common_end(vlc, nb_bits, j, buf, flags, localbuf); + ret = vlc_common_end(vlc, nb_bits, j, buf, flags, buf); if (ret < 0) goto fail; - return vlc_multi_gen(multi->table, vlc, nb_elems, j, nb_bits, buf, logctx); + ret = vlc_multi_gen(multi->table, vlc, nb_elems, j, nb_bits, buf, logctx); + if (buf != localbuf) + av_free(buf); + return ret; fail: if (buf != localbuf) av_free(buf); From patchwork Wed Sep 13 23:47:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 43727 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4b2f:b0:149:dfde:5c0a with SMTP id fp47csp58383pzb; Wed, 13 Sep 2023 16:48:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFdch3QBqFvqopISnsF30yoX9gU6TWOaZEZv8YxU1xmfKnG2sUgx1t7VBw/sN/931mGkhLI X-Received: by 2002:a05:6402:8c5:b0:52e:d2a4:45bf with SMTP id d5-20020a05640208c500b0052ed2a445bfmr3326908edz.30.1694648890311; Wed, 13 Sep 2023 16:48:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694648890; cv=none; d=google.com; s=arc-20160816; b=Z3kZ6tQgYpwTCfYb5gxyUaftu3ZPx1T7cie/N1RYHZ/9raDIn3Fpa/b3l7Bt1QnZi0 Z8Bc79VCJszcm1OprpRS9l3tmcPDvoTarhdmQ/TIBbJOJ/iPd951Wt2bec7tl7Rc8eCd 3STQna+m4h0A9x46ZPHybLpPXu1BxLH/khqbixLpj3I39yanSo8UgL84xzeXGj+B+LjZ bqjjeI5fiLeIlCrQt/D+CR1aUDfJ1qLttL+aaGHh3SAy5pxn5Wa67jAuPs0mnQG8WEkd 5juNgkmFRbNuWOklhJYKVv0jS1WCLwebyXjoplfikFmahKvZYafdEWTEKgh5hpV9zwbA CDdQ== 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=FOATPzIkg9K2y96+ccSYTlPUgOEimQ6fxamu1Y4p/UU=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=z+ga0JHfuWIDn9hqnyY5Bm3747Tsqovv0/40f44KEYi5eegZ/Sfaln+QrKQVwddCOz SKD7SLx0cwk1zui4zKS8h9og2OXu8fjn0LIT6SmtbFA+bW9z4xllNwJwYzX785HDDVvu PtTlB7SXHidqDe7l9FwTNtSCeMhB9hn8m8UsJEL8Vgb6WSL/O0s0QbeQDY0ByntBj6gT zejMHcbk42n7OQlakpFAuA1CWlg0Of2cYFDngoPShLsGVOQnrlb+b0aDlXPcOclt6KpE wyRVM1sAn0L5080QQG9QE0s6AwCBAOVCTLYcIYEDlfj4pHGA2CPvggGmaCwKNbNdhglK 1Stw== 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 y6-20020a50e606000000b0052fcb647657si235775edm.420.2023.09.13.16.48.09; Wed, 13 Sep 2023 16:48:10 -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 E27C568CA0A; Thu, 14 Sep 2023 02:47:45 +0300 (EEST) 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 CCC1668C948 for ; Thu, 14 Sep 2023 02:47:38 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id EC452240003 for ; Wed, 13 Sep 2023 23:47:37 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 14 Sep 2023 01:47:34 +0200 Message-Id: <20230913234734.22402-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230913234734.22402-1-michael@niedermayer.cc> References: <20230913234734.22402-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/aacdec_template: Better avoidance of signed integer overflow in imdct_and_windowing_eld() 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: dZF2m7uF+T76 Fixes: 62171/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-5644657180409856 Fixes: signed integer overflow: 2 * 1079352273 cannot be represented in type 'int' Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/aacdec_template.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 51a4cb2b66f..954399f86bb 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -2856,8 +2856,8 @@ static void imdct_and_windowing_eld(AACContext *ac, SingleChannelElement *sce) ac->mdct512_fn(ac->mdct512, buf, in, sizeof(INTFLOAT)); for (i = 0; i < n; i+=2) { - buf[i + 0] = -(int)(USE_FIXED + 1U)*buf[i + 0]; - buf[i + 1] = (int)(USE_FIXED + 1U)*buf[i + 1]; + buf[i + 0] = -(UINTFLOAT)(USE_FIXED + 1)*buf[i + 0]; + buf[i + 1] = (UINTFLOAT)(USE_FIXED + 1)*buf[i + 1]; } // Like with the regular IMDCT at this point we still have the middle half // of a transform but with even symmetry on the left and odd symmetry on