From patchwork Mon Nov 21 23:58:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39381 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2622254pzb; Mon, 21 Nov 2022 15:58:36 -0800 (PST) X-Google-Smtp-Source: AA0mqf5eh+chJGJMbElpv8XAdoPf6Py+39ZRzj4x/a7VvK6kDTDV30XUco6XKzEC9JwMbxToZCpn X-Received: by 2002:a17:906:4e4e:b0:7ae:e6ac:2427 with SMTP id g14-20020a1709064e4e00b007aee6ac2427mr17514409ejw.345.1669075115746; Mon, 21 Nov 2022 15:58:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669075115; cv=none; d=google.com; s=arc-20160816; b=lX03/vIHW8q4Zq0AmWEoUQnDsc5hRMbUtTEQOJzym0DTITvoVS3F9h2oeTakx0u40l NA8p4rz/cBLafRcicGkogo2WPQr2hEs5xaQ1FvARXpiVPEThUjgZi08HSS85hL3JzVM0 c10rT4GUA80fU4oyG67FKSWxsB9qM3HH9wrsNr1grHv9cAPqjpYCZ9WxAE8jiUT2uci+ H5LRjGwmp/+/FnFBbsATvYrXviZLAu0EfDsjtyij5yUn1doKw+LX2MXjQ6SyqmXJlZin vaysebE7oBnZnDBtlIsjwthxhifSpLFv6OA0SLx6hPgKQ9nih57FljG2ypGG4gOAITxI o7Nw== 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=EUG4SbD57pBdmSNgwQ8AxYI05+sf/92TaXRUo3Wjsxc=; b=QXov1PeoFNDhFHmW69kJYnQ4y2qRNEJrTk0AShTNGfNj9EWOhI3dSjBgZ3DJP98oDC yyiCUXjUM13F65uHqss/MPkLVi32Q+IOA3js6/oa8jZmE03zmKTJPAw20/P6zOVHDI+g nDwyXWFWCM+AH7Pkx3nColxE94eEXFaoIaWab19ACNaGuqwuM77GGxuCt3+gMkzSdf0X MDfQRENx7uFHeRID3ImtcOQe6J3yVOdEkz1EEEly/GcKVjySWTkKs1XC7EhXbMVtLBV/ CZPiiPvC+Y1z7DplfmjWBmx5htvZ9luuI/fYVPXLQc49nKFb2TFMr03FiVvV74ouECno 34TA== 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 cs13-20020a0564020c4d00b004615c5728e8si9136125edb.494.2022.11.21.15.58.35; Mon, 21 Nov 2022 15:58: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 6458068BA43; Tue, 22 Nov 2022 01:58:31 +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 5607F68B1A1 for ; Tue, 22 Nov 2022 01:58:24 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id EF5DE60002 for ; Mon, 21 Nov 2022 23:58:23 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 22 Nov 2022 00:58:21 +0100 Message-Id: <20221121235823.28468-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/3] avutil/tx: Use unsigned in ff_tx_fft_sr_combine() 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: vx3TkYqJTRDH Fixes: signed integer overflow: -1284837070 - 982101618 cannot be represented in type 'int' Fixes: 53105/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AC3_FIXED_fuzzer-4848015827664896 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavutil/tx_priv.h | 3 +++ libavutil/tx_template.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libavutil/tx_priv.h b/libavutil/tx_priv.h index fb61119009..6f01f305fc 100644 --- a/libavutil/tx_priv.h +++ b/libavutil/tx_priv.h @@ -34,6 +34,7 @@ #define MULT(x, m) ((x) * (m)) #define SCALE_TYPE float typedef float TXSample; +typedef float TXUSample; typedef AVComplexFloat TXComplex; #elif defined(TX_DOUBLE) #define TX_TAB(x) x ## _double @@ -45,6 +46,7 @@ typedef AVComplexFloat TXComplex; #define MULT(x, m) ((x) * (m)) #define SCALE_TYPE double typedef double TXSample; +typedef double TXUSample; typedef AVComplexDouble TXComplex; #elif defined(TX_INT32) #define TX_TAB(x) x ## _int32 @@ -56,6 +58,7 @@ typedef AVComplexDouble TXComplex; #define MULT(x, m) (((((int64_t)(x)) * (int64_t)(m)) + 0x40000000) >> 31) #define SCALE_TYPE float typedef int32_t TXSample; +typedef uint32_t TXUSample; typedef AVComplexInt32 TXComplex; #else typedef void TXComplex; diff --git a/libavutil/tx_template.c b/libavutil/tx_template.c index 666af5e496..b624869010 100644 --- a/libavutil/tx_template.c +++ b/libavutil/tx_template.c @@ -497,7 +497,7 @@ static inline void TX_NAME(ff_tx_fft_sr_combine)(TXComplex *z, int o2 = 4*len; int o3 = 6*len; const TXSample *wim = cos + o1 - 7; - TXSample t1, t2, t3, t4, t5, t6, r0, i0, r1, i1; + TXUSample t1, t2, t3, t4, t5, t6, r0, i0, r1, i1; for (int i = 0; i < len; i += 4) { TRANSFORM(z[0], z[o1 + 0], z[o2 + 0], z[o3 + 0], cos[0], wim[7]); From patchwork Mon Nov 21 23:58:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39383 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2622312pzb; Mon, 21 Nov 2022 15:58:45 -0800 (PST) X-Google-Smtp-Source: AA0mqf46e2xzBXjWCemjc+JMP7hqsMkrfMP/LLUUgh2oVBt2aFSs36m6fFQE0b4pV17CD+7vKiG8 X-Received: by 2002:a17:906:124d:b0:7ad:b822:d2e4 with SMTP id u13-20020a170906124d00b007adb822d2e4mr17412024eja.35.1669075125225; Mon, 21 Nov 2022 15:58:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669075125; cv=none; d=google.com; s=arc-20160816; b=OMvRdIFsg6l57lAgqvLTwwgD4+bBjO9PaXLiyEMsFJlr5scrO6QiW2XjpC+VFDev0M /vgyoXJEBChsOIHu8tV+ofNfNuIi3V2/JDeOTbE5glZEOVo7ErluH6LvUizuR+cah+Ko Lf93njBaujBoF1B9xWIICe9BCfZDYomVwSAmA6pFudzatdbsKY5C/YN4zS9BtkChJeB2 iEIMAdO159wPAVj9bzm+DTqzRri/HncGTFoKfk3zwO/hmBbdJ9/e9w7ZmyK+T7kOmPdx 6219Gt2D4PlZGkwiRXvOZ3kykA8eo+rRQyarHV6CV5ymVFp4nLhzC5xZUYIQtW3RMtb5 kkcA== 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=d7LxUjSRJA+0dxelidTkhV1OjZSRSRD8hrJec8nJdj0=; b=LVg1vatrJA01oXkKjNM1FlvMDhEw7E7qXEQ6GBjgAJ8rlOiH3h7MZ8D6EEy8BwlQ8t Io+V5pDE+LFpDW71ApuG+BiTnsJ8CgQtSjVAO4ouZiWilJUS47XiZQXJEg0YqzfdXS1f gGX8phK+eNnKQGHYm1WE/3xJHA3LNYkO9+1ig8giVW5iaBgqQDmFqxqkePYvI5M9EcsK QYvZ54bc+g0jRz8ofEzeqJVDDkAExQZy/Oshh+K0HWNO040DTWmpG4siIDcGk8UFn6Kj MIIXSXLR5qZE8uOcKCeowhTobIGgKqOEu/g9Wrurb7WmyLVQXKSwdedOGXCObxuuCL0F N9UQ== 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 wv4-20020a170907080400b007ad855bc09csi11748230ejb.595.2022.11.21.15.58.44; Mon, 21 Nov 2022 15:58: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 7D69868BAC7; Tue, 22 Nov 2022 01:58:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C795D68B1A1 for ; Tue, 22 Nov 2022 01:58:25 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id EB7E140003 for ; Mon, 21 Nov 2022 23:58:24 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 22 Nov 2022 00:58:22 +0100 Message-Id: <20221121235823.28468-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221121235823.28468-1-michael@niedermayer.cc> References: <20221121235823.28468-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/mlpdec: Check max matrix instead of max channel in noise check 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: kPv+JHUqhgpg This is a regression since: adaa06581c5444c94eef72d61b8166f096e2687a Before this, max_channel and max_matrix_channel where compared for equality Fixes: out of array access Fixes: 53340/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEHD_fuzzer-514959011885875 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mlpdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 0b0eb75990..5b14a3b03b 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -539,7 +539,7 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, /* This should happen for TrueHD streams with >6 channels and MLP's noise * type. It is not yet known if this is allowed. */ - if (max_channel > MAX_MATRIX_CHANNEL_MLP && !noise_type) { + if (max_matrix_channel > MAX_MATRIX_CHANNEL_MLP && !noise_type) { avpriv_request_sample(m->avctx, "%d channels (more than the " "maximum supported by the decoder)", From patchwork Mon Nov 21 23:58:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39384 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2622372pzb; Mon, 21 Nov 2022 15:58:53 -0800 (PST) X-Google-Smtp-Source: AA0mqf7pk/UPXsjoz6f+66EXGI83uybUkwaQPmbObUt991pd3g+jPdV7Ukunw5CKot8hMfDiFLS4 X-Received: by 2002:a17:906:3e18:b0:78d:8d70:8bf8 with SMTP id k24-20020a1709063e1800b0078d8d708bf8mr2207521eji.15.1669075133272; Mon, 21 Nov 2022 15:58:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669075133; cv=none; d=google.com; s=arc-20160816; b=JOvXoohmRtTfgmYwdTeEjp8VZRbvLA5wTp02pFxs8rZaKSIFeDMChry5nC3J/aeTIN rv3ApgNSEahknVvQwM4U5BQYPWGey4QxJDSViGruOuts6u1BrPdT+rctOGx09M+zL2/u K/9BYhXbbmtfqEI6yJBTzt0PLIUykWvfnvJagqs4NK9lTYKi7b6NV/tChU6KMIYTrRla 9KYax3258Dc56BfDmn9y/sdnj3NvaO0zt242HOgQ+JCv/4stcLP1S1kaMFKZlWNP0GN0 7nAmlxlosa953vKl+3di2lRJ5F2LrcrHSI07gsxMA9ulqsuoeGOhRkNaR6XmSOdogV4S 7SlQ== 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=xxWq/MuzSz5vvoHw55R11JSiwCYvC5QeufG8CAkp9BE=; b=mrlqK4mBsic8PACyEU4FMlKRYyBC1th26sOtIqu3ikUkH8NYwFhmgZGP/bj0TPAvWj vKKY2FF/IZ7xsOmvXG8BZT0+jBo3D0BuLjt1dbmW8EfnX2tKvd853QaFc8HdvKHBW+XH O9lRLp2bXyjc5m3xE8GtDXU7eIO44a9qEiH1Vupd1wus5fpJcWwOebHZTl+fW8rIaPHl wzmgMyRcT64uoNM8KPAQwiueCR8wBMU0509GauKKtfT3i0w18BBcRhXYAizmSOs/6Gh4 8R4iYH7q9VcNtH8PIe1JO1aiAumjRkaNnHlT9Qfkm/gqFjTLZkk70z5d98WV+66RZ3cV AWWg== 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 xe8-20020a170907318800b007ae9bc0b977si10895225ejb.486.2022.11.21.15.58.52; Mon, 21 Nov 2022 15:58: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 86E4068BB37; Tue, 22 Nov 2022 01:58:33 +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 0EC4A68BAC7 for ; Tue, 22 Nov 2022 01:58:26 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 34AAAFF803 for ; Mon, 21 Nov 2022 23:58:25 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 22 Nov 2022 00:58:23 +0100 Message-Id: <20221121235823.28468-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221121235823.28468-1-michael@niedermayer.cc> References: <20221121235823.28468-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/dts2pts_bsf: Eliminate some 64bit corner cases 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: EmDaFB64wkS0 Fixes: negation of -2147483648 cannot be represented in type 'int'; cast to an unsigned type to negate this value to itself Fixes: 53364/clusterfuzz-testcase-minimized-ffmpeg_BSF_DTS2PTS_fuzzer-4693772269387776 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/dts2pts_bsf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/dts2pts_bsf.c b/libavcodec/dts2pts_bsf.c index 8142562d2c..522d5e1eb0 100644 --- a/libavcodec/dts2pts_bsf.c +++ b/libavcodec/dts2pts_bsf.c @@ -301,15 +301,15 @@ static int h264_filter(AVBSFContext *ctx) if (output_picture_number != h264->last_poc) { if (h264->last_poc != INT_MIN) { - int diff = FFABS(h264->last_poc - output_picture_number); + int64_t diff = FFABS(h264->last_poc - (int64_t)output_picture_number); if ((output_picture_number < 0) && !h264->last_poc) h264->poc_diff = 0; - else if (FFABS(output_picture_number) < h264->poc_diff) { + else if (FFABS((int64_t)output_picture_number) < h264->poc_diff) { diff = FFABS(output_picture_number); h264->poc_diff = 0; } - if (!h264->poc_diff || (h264->poc_diff > diff)) { + if ((!h264->poc_diff || (h264->poc_diff > diff)) && diff <= INT_MAX) { h264->poc_diff = diff; if (h264->poc_diff == 1 && h264->sps.frame_mbs_only_flag) { av_tree_enumerate(s->root, &h264->poc_diff, NULL, dec_poc);