From patchwork Sun Mar 26 22:26:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40849 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp885944pzh; Sun, 26 Mar 2023 15:27:05 -0700 (PDT) X-Google-Smtp-Source: AKy350akomHgXHtEb99hkGaMw78fQJUK0q6o6w8X0kO9bpXZ66meF1hcXBjwphRpSjGFCrZykqRs X-Received: by 2002:a17:907:8c0e:b0:930:bc07:3bf7 with SMTP id ta14-20020a1709078c0e00b00930bc073bf7mr11675458ejc.5.1679869625336; Sun, 26 Mar 2023 15:27:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679869625; cv=none; d=google.com; s=arc-20160816; b=iHspLCGoANKJkSNXPGMueaS4T55vm6MTrz8s+SYvh8fLH0sfJRRnHKsBbTnOE8QMib KAcblLf25639z/u8kbAwkDIJzkSsgbQH/6Z6Zza1DU2hoozpSHvvZKXPHn8Q0yfk+3v1 nJ94+UUxX2UpyOWPrrV76iBLpy6DWDzHI9FQ/hGTqdBSKZPiaobu55/kz3zV7GY6m69O k6peAKIwZtJqi4lgNSZ9QMUqVmkki6ZTtf6wRrNlNCiKSGMANIXIAMd3+KMZRiTv2qGC gk/6BaCZFZrzb6SwgscluU5LxF2MDSk2NXkUKhThLu14pb9gMcjD18unkEsPE3xHxUcZ 6Ggg== 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=dnjxshsLCuQXS69vZ4g7bHHhLAMzObCfy5ymnsDPrfw=; b=S3zicIDQ9lOVzitv0bCHxJlVHy29ftg+kk110L11f9rNNnwqrn4BMoLAy01R9jJMKr 9y27Jr+whjtaFUTgZtVuiRv2iPDtreldGhMTEKme09LKLy7TJH3as7+UVcPN6ohJD1cn mkdgKJlboLUNgC8WAn9Gg5id+D71SgmVCRRXmiiyRtbiFXJ/qE5gzTOQt0E7G2aptYp5 WLiG1jX5L+3KEsoIKatFRrnBABES4mNmy36ioba1JKP32TRR2hBHDEY0PvllYoj4l4Ct P646FShht+VQiKSpiXKSGV4NorWtYbITpAxgd3k50iKbq3zDIMaAsjKCKc7oWt/clS7K iQBg== 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 hp33-20020a1709073e2100b00934e2ca8548si22437574ejc.210.2023.03.26.15.27.04; Sun, 26 Mar 2023 15:27:05 -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 8309068C63B; Mon, 27 Mar 2023 01:26:52 +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 E6FB968C477 for ; Mon, 27 Mar 2023 01:26:44 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id CE7A5FF802 for ; Sun, 26 Mar 2023 22:26:42 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 27 Mar 2023 00:26:39 +0200 Message-Id: <20230326222642.2489-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/wavarc: Fix several integer overflows 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: I18BlnCj7f/x Fixes: signed integer overflow: -532410125 + -1759642300 cannot be represented in type 'int' Fixes: 57045/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVARC_fuzzer-637023665297817 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/wavarc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/wavarc.c b/libavcodec/wavarc.c index 8d37af95716..896972cec82 100644 --- a/libavcodec/wavarc.c +++ b/libavcodec/wavarc.c @@ -349,7 +349,7 @@ static int decode_2slp(AVCodecContext *avctx, int sum = 15; for (int o = 0; o < order; o++) - sum += s->filter[ch][o] * samples[n + 70 - o - 1]; + sum += s->filter[ch][o] * (unsigned)samples[n + 70 - o - 1]; samples[n + 70] = get_srice(gb, k) + (sum >> 4); } @@ -452,7 +452,7 @@ fail: const int *src = s->samples[ch] + s->offset; for (int n = 0; n < frame->nb_samples; n++) - dst[n] = src[n] * (1 << s->shift) + 0x80U; + dst[n] = src[n] * (1U << s->shift) + 0x80U; } break; case AV_SAMPLE_FMT_S16P: @@ -461,7 +461,7 @@ fail: const int *src = s->samples[ch] + s->offset; for (int n = 0; n < frame->nb_samples; n++) - dst[n] = src[n] * (1 << s->shift); + dst[n] = src[n] * (1U << s->shift); } break; } From patchwork Sun Mar 26 22:26:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40848 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp885867pzh; Sun, 26 Mar 2023 15:26:55 -0700 (PDT) X-Google-Smtp-Source: AKy350bYx5ShMSetfmQs0K/L/8cIzY7JexXzrs3jiVR1aU1tXdPInx4dTHvoTmw/MmMzZji0mLMb X-Received: by 2002:aa7:d14e:0:b0:500:58cb:3b05 with SMTP id r14-20020aa7d14e000000b0050058cb3b05mr9711554edo.27.1679869615731; Sun, 26 Mar 2023 15:26:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679869615; cv=none; d=google.com; s=arc-20160816; b=ua6ssihbkRgSJtb/2q0oidhKXjdQCbLJpKvYThE+OZoXjpCgGwWm/Ohstw3jjcuaUI MzELG58V9RTVhwtXS5bOOzCSu0yXfSGPsB6tfyoUJNo0tNJ0DVRTCEV6vqxeXJRB3Me2 GXWYxQsHTnavsbBUoh8qVqWsloz1gbqIuom0VhY0Hnx3bzv+CAt3VJT5nY1hiRam9EWn 6hrog+kUut/zfll9ArlcQiide9jHpJpl6eKM+6I/ac4ce9su3EBW28+IeM3pP0Mc3tNJ FMs7EZjcXV8PUOWKsJonTLQxJUB4gygOdOy04ccfgN/CO2F4ttilxeEi+FavI0Vw9A7l XuPA== 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=OG1yxWKzbHpGpu9ACkaUOW5WYlTDxnRC1EIiov5VHns=; b=x41VrwACpve9e7kTa+fzvT6g8MSWASRwr+TmpktS63GgzzxvhO78RHWRvNeIEOPdNf dApIrU/XMZELW9K7+qSHU+3ixFeVykHk52aGRvgfllFqxknn5l/XeFFDBlbXbZyCMeb1 C0hnrCPRRGZhLEWhz+Ru4f42VpzSGHawXs7LKtYLullPcsuAuVXk9mgQGq3n0Lzk/zEP b8/QYMq1Pe0u4UYkszI+i7fu0xS/6nvMOTGAup3Uf413hU+3fXLoufe9jmpw/JcvRY3I T4XC+Azvg1kCTAH1hjj49ZjIiJzFuAALSIAOneei6m2+KIVGMWWLj5qFzkpanvRLo67h dCRw== 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 m6-20020a50ef06000000b004acdca4e902si25647037eds.127.2023.03.26.15.26.55; Sun, 26 Mar 2023 15:26:55 -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 5B7A268C477; Mon, 27 Mar 2023 01:26:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E9D3068C618 for ; Mon, 27 Mar 2023 01:26:44 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id D1253240002 for ; Sun, 26 Mar 2023 22:26:43 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 27 Mar 2023 00:26:40 +0200 Message-Id: <20230326222642.2489-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230326222642.2489-1-michael@niedermayer.cc> References: <20230326222642.2489-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/vc1dec: Use av_fast_realloc() for slices 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: gQmCviVg4dMR Fixes: Timeout Fixes: 57281/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VC1IMAGE_fuzzer-4594141064724480 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vc1dec.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 5cb4c544c9a..18fb616fff5 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -836,6 +836,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, AVFrame *pict, const uint8_t *rawbuf; int raw_size; } *slices = NULL, *tmp; + unsigned slices_allocated = 0; v->second_field = 0; @@ -859,6 +860,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, AVFrame *pict, //for advanced profile we may need to parse and unescape data if (avctx->codec_id == AV_CODEC_ID_VC1 || avctx->codec_id == AV_CODEC_ID_VC1IMAGE) { int buf_size2 = 0; + size_t next_allocated = 0; buf2 = av_mallocz(buf_size + AV_INPUT_BUFFER_PADDING_SIZE); if (!buf2) return AVERROR(ENOMEM); @@ -882,7 +884,8 @@ static int vc1_decode_frame(AVCodecContext *avctx, AVFrame *pict, int buf_size3; if (avctx->hwaccel) buf_start_second_field = start; - tmp = av_realloc_array(slices, sizeof(*slices), n_slices+1); + av_size_mult(sizeof(*slices), n_slices+1, &next_allocated); + tmp = next_allocated ? av_fast_realloc(slices, &slices_allocated, next_allocated) : NULL; if (!tmp) { ret = AVERROR(ENOMEM); goto err; @@ -911,7 +914,8 @@ static int vc1_decode_frame(AVCodecContext *avctx, AVFrame *pict, break; case VC1_CODE_SLICE: { int buf_size3; - tmp = av_realloc_array(slices, sizeof(*slices), n_slices+1); + av_size_mult(sizeof(*slices), n_slices+1, &next_allocated); + tmp = next_allocated ? av_fast_realloc(slices, &slices_allocated, next_allocated) : NULL; if (!tmp) { ret = AVERROR(ENOMEM); goto err; @@ -946,7 +950,8 @@ static int vc1_decode_frame(AVCodecContext *avctx, AVFrame *pict, } else { // found field marker, unescape second field if (avctx->hwaccel) buf_start_second_field = divider; - tmp = av_realloc_array(slices, sizeof(*slices), n_slices+1); + av_size_mult(sizeof(*slices), n_slices+1, &next_allocated); + tmp = next_allocated ? av_fast_realloc(slices, &slices_allocated, next_allocated) : NULL; if (!tmp) { ret = AVERROR(ENOMEM); goto err; From patchwork Sun Mar 26 22:26:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40850 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp886022pzh; Sun, 26 Mar 2023 15:27:13 -0700 (PDT) X-Google-Smtp-Source: AKy350bZfqKnasm9e4ayRD5OY9AxOW0YJEy+qPSadCoV47UYPd6H7yesVQdW65PllEl6QrbF6ytM X-Received: by 2002:a17:907:2ced:b0:8f5:8da0:a482 with SMTP id hz13-20020a1709072ced00b008f58da0a482mr8301940ejc.25.1679869633759; Sun, 26 Mar 2023 15:27:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679869633; cv=none; d=google.com; s=arc-20160816; b=DmTJEVlLY34cBhWYw2T56fN9oLvp01DNTsFmXzYhF2vqLcu9Ch7a63NDwntNkI5VGH K5NnkfDlUYrL6h8YJ/OuBFvD48yhjXee9Rc5fc0IylDTWLQZgee1yupyyOxAva+u049n vF3qg8BkOm/WF05f3kh7vS7jHqCwsKEdJTQVYxxLuGVQmKUgwFao526aP134KUqeDlGW R9tnXYtFV/PXHwCurdEBYkc0t3y3LhxkmDpvspc+fPgjPursk2zf416daahKLX88UStv WANTLEPce1FYNVwWJWBogUNM5oAoPMHCFPixL82cfJBGUUr5TKwMLr1bzjDVzaKeOw92 sHSQ== 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=+9ihd0foudZekCkr08dLWX6Ygmwg5JQNY2pU1WqxyuY=; b=NBH4Gh98jbL0c2/Y00xaVNhvBC/C43Vym5jKHbDPwv3w0/Txe/U2iz/nuXXol/DGgJ MOEH4M/PEU+syrUSoKNQigovCaxnLJlWdpH53gVp/L22zysQeh7U/NhKaKK/TSfMZpqJ qGJstJ3Q21jfuC/Vsl/Anf4Xjvdub0ZZSE6hACY0yul50Sw6zeysj7sp3cB73lN+j7Ex 34W4gDuYhyVnZQe9xtBC2oA3aRHLZUbLt5c82fxrJuJLwq9dqlKc3Yv4SxGrp2uy5tMp d2Uu9zandEufU+vQxrSNyb9MZFVduT8usZEo97DEdxcjuBsn7dWyFuOtADVsCmn2/Xtb IvBA== 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 h18-20020a1709063c1200b0093c96e480d1si9854816ejg.437.2023.03.26.15.27.13; Sun, 26 Mar 2023 15:27:13 -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 9720268C678; Mon, 27 Mar 2023 01:26:54 +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 C847A68C3FF for ; Mon, 27 Mar 2023 01:26:45 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id DDBF020005 for ; Sun, 26 Mar 2023 22:26:44 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 27 Mar 2023 00:26:41 +0200 Message-Id: <20230326222642.2489-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230326222642.2489-1-michael@niedermayer.cc> References: <20230326222642.2489-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/g729postfilter: Limit shift in long term filter 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: s1sbowlxWoI8 Fixes: shift exponent 34 is too large for 32-bit type 'int' Fixes: 57389/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ACELP_KELVIN_fuzzer-6229522659016704 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/g729postfilter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/g729postfilter.c b/libavcodec/g729postfilter.c index f3cacbac05b..26e937f0baf 100644 --- a/libavcodec/g729postfilter.c +++ b/libavcodec/g729postfilter.c @@ -353,7 +353,7 @@ static int16_t long_term_filter(AudioDSPContext *adsp, int pitch_delay_int, if (tmp > 0) L_temp0 >>= tmp; else - L_temp1 >>= -tmp; + L_temp1 >>= FFMIN(-tmp, 31); /* Check if longer filter increases the values of R'(k). */ if (L_temp1 > L_temp0) { From patchwork Sun Mar 26 22:26:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40851 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp886101pzh; Sun, 26 Mar 2023 15:27:23 -0700 (PDT) X-Google-Smtp-Source: AKy350a1ZgY5xuZdpLNP+HJYdSFMlshVYwR9WNB6/BEnJ+yCmlNiXRh2Ra/E5JYUsBvGKwpI+XTg X-Received: by 2002:a17:906:af87:b0:884:9217:4536 with SMTP id mj7-20020a170906af8700b0088492174536mr10457781ejb.64.1679869643059; Sun, 26 Mar 2023 15:27:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679869643; cv=none; d=google.com; s=arc-20160816; b=nJoLC8nHfzTF1vfbiOHnwZ/GB9N3pZTz1A69f5/XrS9O++b8lISKBGYSfnIBPv141Y dFQqshMF9n9BTZ7SbmGAhbvRh5iFa5IKA9KABQf6I41aXWJ8arjW7uIW4Wf1Zk3gcycn G9WkbyMNATi/k9PDYgzYY0I9Jqj+ttGiwW7lqCaQOlMw1A9ZMZgvA8wbHHvvuRarBDrA KuxcaqtzMvStwJ9HEFtE/nU0kZ05d8lwHss9UusjvPECCDL0QoeSRVKp2L3UZoLwz78+ eWg2ccnrCuaI0WWqEFaUGuSNvd4GU7nC/A5j8jmXzUDxXSfOZsTAIenGRhN/DZ+g6Clu 17+Q== 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=CmxqVXKwa7iEv5O+4ltCvlWgiTUYWm5nEWvRP/nCPXI=; b=oO3HrooasARtj7juhVr3eGM69kvWMgB05J4/S+l8FVocxRKQDTXjkbIwth0BjrwWyf hxcjMurAhUGOhCHQx4JH78B5WC0AGZNodXUCoC+Yon96gTqsT7pyXxfDaSg/aLqWlgBo e7Wl2YAcBaZu+/XziMnmC8QqnLHaJ1TcfpCA6Fs+Sf7MVS7qvjyhHZaq8j9LvP5it7pH brBr3YhGK80tQrFpnDhRxPOCynXvsBRxuddbPoxX3y2AQDormlEul7nyvsmWujP8Ju4A ejdTQjb86YJvyArZUO+MPumPPXrctLaVq/xDvhilR0i/5zUAziV3mKxb6eKDgOOgj7RJ RsiQ== 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 xa13-20020a170907b9cd00b009334f7bc132si8746344ejc.947.2023.03.26.15.27.22; Sun, 26 Mar 2023 15:27:23 -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 A294668C68A; Mon, 27 Mar 2023 01:26:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5FB5D68C61C for ; Mon, 27 Mar 2023 01:26:46 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id B2BAD240004 for ; Sun, 26 Mar 2023 22:26:45 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 27 Mar 2023 00:26:42 +0200 Message-Id: <20230326222642.2489-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230326222642.2489-1-michael@niedermayer.cc> References: <20230326222642.2489-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/vp3: Check width to avoid assertion failure 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: UoXDT+IdLrm0 Fixes: Assertion failure on x86-32 Fixes: 39641/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_THEORA_fuzzer-5925660741206016 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vp3.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 9660def675f..22348559461 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2353,6 +2353,8 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx) s->avctx = avctx; s->width = FFALIGN(avctx->coded_width, 16); s->height = FFALIGN(avctx->coded_height, 16); + if (s->width < 18) + return AVERROR_PATCHWELCOME; if (avctx->codec_id != AV_CODEC_ID_THEORA) avctx->pix_fmt = AV_PIX_FMT_YUV420P; avctx->chroma_sample_location = AVCHROMA_LOC_CENTER; @@ -2919,7 +2921,9 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) /* sanity check */ if (av_image_check_size(visible_width, visible_height, 0, avctx) < 0 || visible_width + offset_x > s->width || - visible_height + offset_y > s->height) { + visible_height + offset_y > s->height || + visible_width < 18 + ) { av_log(avctx, AV_LOG_ERROR, "Invalid frame dimensions - w:%d h:%d x:%d y:%d (%dx%d).\n", visible_width, visible_height, offset_x, offset_y, @@ -2965,6 +2969,8 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) } else avctx->pix_fmt = AV_PIX_FMT_YUV420P; + if (s->width < 18) + return AVERROR_PATCHWELCOME; ret = ff_set_dimensions(avctx, s->width, s->height); if (ret < 0) return ret;