From patchwork Fri Apr 1 10:46:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35129 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp560567pzb; Fri, 1 Apr 2022 03:46:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwwBpg1MFcLF1twET2YdLiAa86WeUmLHtoxpTBiBxw8WNdVlLPklBzdvi2jOgPi+xMyXMeh X-Received: by 2002:a05:6402:1cc1:b0:413:2cfb:b6ca with SMTP id ds1-20020a0564021cc100b004132cfbb6camr20162176edb.265.1648810003488; Fri, 01 Apr 2022 03:46:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648810003; cv=none; d=google.com; s=arc-20160816; b=chakmrkp5+GgGWHp+2Mwv3MHruObj5sLycaxVcv9smbXPiUzY5kv2yBgAHcPbSCE3F ERVYafDRnHGFKCcIw3yL24n6j/l+RlULKtY7wgSkXhDmFVx4LsvQ1vPBofttXPQG+JoY YUL3sUfq9ehSlydCB+uuRPtVZ4/73bfisEsntBJ2cpGQH8I1rE2ED72QdXwXHQ7JO0jF JDPiun92oFxsWRBigjux1HRqJpa3nZdSpp+rphi42jj3cpsi/kWRWSSxgooHSAP/efU2 5aeeMkSPkXU/oonP4Vh02gR5+LLvJlvQ5u0kiA1DxlkrrpAx+VuU8QR7WZWJAZT6C3wM Ot2w== 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=+WRroWUS9EQEwe4eqpyrwa2dOlkWTvpAK5LkCmtz0iA=; b=v4opioZNpU4d5YPIZgN1s2D0p6X4kGt6mKG1cpX6pH3bV14gp5cpi14BwPHW9eQC2z o1MHq5g7CTtVwJWQl6E+q100OUCy8kS9iAR6hz7bMTH5SV662cv9wYY3Y9JpfE5/u2sz AKsZMkKH7pS9Ofe/Hf/LfCXK4lqhremLJ8/jBqU/ZlWjoTu2q2VoPkrq0UBzPdW58WBz VgS9X371lQfjOpwGnizNYzikKnaCMw78G+1J/gCuECK+g8bYISJs4ayRW1qyBWOETk/E kZPhLYjIzS9PZo8TCpojuRJqcqsuWCODOpDV+ekFWbwoDQeIr0psEabJZIbcw4uUxBhA VK8g== 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 i21-20020a170906115500b006df76385e5bsi1315783eja.763.2022.04.01.03.46.42; Fri, 01 Apr 2022 03:46:43 -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 B315F68B0AD; Fri, 1 Apr 2022 13:46:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4554F68B192 for ; Fri, 1 Apr 2022 13:46:32 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1naEnQ-0005QH-Sr for ffmpeg-devel@ffmpeg.org; Fri, 01 Apr 2022 12:46:24 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id aEdpnJXEwSgGFaEnQnnPQz; Fri, 01 Apr 2022 12:46:24 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id aEnBnZHTH8eSWaEnBn7GzY; Fri, 01 Apr 2022 12:46:09 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=6246d800 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=h-hOpKCbeYjIeEGYTeAA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 1 Apr 2022 12:46:07 +0200 Message-Id: <20220401104608.10193-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfBy+gEEsOqItpKdy5N3AWWILMNAThDL++q2ZZCArvDtHVScXjpALaoL77s+1df+z6gnykjkY7DG4F6wEFVBnhZZZD/Tbmd5wfHjBYBWMjPGtBQTzC+hP 2O9lZqqDvHhVWtQlvlIkMdml2mVLG4PQSFrWjG3zi9fRCzGKPxNF3WGBFaDw4YhJ0AL5ies4uvyB2A== Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/wmalosslessdec: Check channels after setting them 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: Wf9KuTC5tKK0 Fixes: 46194/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMALOSSLESS_fuzzer-580292873827123 Fixes: stack-buffer-overflow on address 0x7ffc0ce69b30 at pc 0x00000062fb03 bp 0x7ffc0ce69af0 sp 0x7ffc0ce69ae8 Fixes: 46205/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMALOSSLESS_fuzzer-5354894996930560 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/wmalosslessdec.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index d4f3462804..fd16f3f9bc 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -191,13 +191,6 @@ static av_cold int decode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - av_assert0(avctx->ch_layout.nb_channels >= 0); - if (avctx->ch_layout.nb_channels > WMALL_MAX_CHANNELS) { - avpriv_request_sample(avctx, - "More than " AV_STRINGIFY(WMALL_MAX_CHANNELS) " channels"); - return AVERROR_PATCHWELCOME; - } - if (avctx->extradata_size >= 18) { s->decode_flags = AV_RL16(edata_ptr + 14); channel_mask = AV_RL32(edata_ptr + 2); @@ -226,6 +219,12 @@ static av_cold int decode_init(AVCodecContext *avctx) av_channel_layout_uninit(&avctx->ch_layout); av_channel_layout_from_mask(&avctx->ch_layout, channel_mask); } + av_assert0(avctx->ch_layout.nb_channels >= 0); + if (avctx->ch_layout.nb_channels > WMALL_MAX_CHANNELS) { + avpriv_request_sample(avctx, + "More than " AV_STRINGIFY(WMALL_MAX_CHANNELS) " channels"); + return AVERROR_PATCHWELCOME; + } s->num_channels = avctx->ch_layout.nb_channels; From patchwork Fri Apr 1 10:46:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35130 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp560868pzb; Fri, 1 Apr 2022 03:47:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0ttooMJLrfiASc9nB8/Wcm15wl251aAHPQYnfme3LpDUfCq6hKga4FtJfq2UGqYuD+GjS X-Received: by 2002:a17:907:6d11:b0:6df:f38b:b698 with SMTP id sa17-20020a1709076d1100b006dff38bb698mr8948333ejc.711.1648810059038; Fri, 01 Apr 2022 03:47:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648810059; cv=none; d=google.com; s=arc-20160816; b=tTF63kGCctBqNEr+k+sV6ihA12d54teFtDCkX7D+qicQlooaCicErDktip7VQ02uxN FNm972cURVIcnhDgxj5ltRc3B53eHloFVB63y/isTuIHMIfKCBChrOSZrI3dehMQQ4WT dJOJlVPGIF7EozninPgRXJPgmMDs9HqCmiDNuYqnRJJJRFPYCT2ozndRl5Dul7GVVnWL t/QqXLsCWpcwy79W89efSfUrX/QlGyBIwAvF1G4sMMX9F2Kwf/qQpsT66W6ucx0UtKI6 VOOAisGTjinSMmPQms7a5ouS0YIXcoGg1zNYTGsm/lj+d/7VCfzSXujcSYND59vCOs5m rKCw== 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=HGFP6YvqSWnLBZs2ED5jbLdltu+VScBmwtmwYS7VBMc=; b=KnAoi6RusrsYuS7Eiq5A3FogUEQypfl3hakVIBtQBo1tqvEX3sgRr9Wi0DsM6VLbBN +ILJCy3/AcbvmmCgzd67ZEwN+AhaKcf1+SjfS5Al/uuZZOHZrVFDI7acuZ6432R9NSNB RL+XOA5m22thLbJtLXnYyDGWwoKq96uHYDkWjkIe0RQo3oM+NNEmJ2oHdU/ynN8pBzXL qjyXenwGK36Rzu26BPDXbs0Tq2ywLFmSaDvT7ag6Krmb1mW/nPDaI/62tU1uO9mZLeSl o2p+hRKBS1SSdEl62nd/tHobtfxLb9KwGX4MoifeBzALAlxKtp/h+C/utoLK4BpQ/soo TM2Q== 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 q12-20020a1709060e4c00b006e0332e32f8si1281819eji.456.2022.04.01.03.47.38; Fri, 01 Apr 2022 03:47:39 -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 DC61668B23C; Fri, 1 Apr 2022 13:47:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 782DF68AB45 for ; Fri, 1 Apr 2022 13:47:30 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1naEoO-0005QG-1J for ffmpeg-devel@ffmpeg.org; Fri, 01 Apr 2022 12:47:24 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id aEg9nJac1SgGFaEoOnnPWj; Fri, 01 Apr 2022 12:47:24 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id aEnBnLxczOPqFaEnBnTN1s; Fri, 01 Apr 2022 12:46:09 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=6246d800 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=abq5NqogEe8bT_74xI8A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 1 Apr 2022 12:46:08 +0200 Message-Id: <20220401104608.10193-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220401104608.10193-1-michael@niedermayer.cc> References: <20220401104608.10193-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfIYrdbfFM3eVq27O3qf4+/F88x1ffBjiPDkYBTdjPS8VjWLY1/lNbiq6cLILSojT44sOSi3LSuKCm++AWyOcfp3Qu5D/C3InJZbnlryZntze1vMlw90c lgvgfEmhaFyU6gfc5L4RoL5pvj96LxNaPpmcxggz3eLaKJWq6nLF3E6HN3WuC24cR7gGcH2vrQ7Ejw== Subject: [FFmpeg-devel] [PATCH 2/2] avformat/matroskadec: avoid integer overflows in SAR computation 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: 4kYMw7imkC88 This ignores >64bit Alternatively we could support that if it occurs in reality Fixes: negation of -9223372036854775808 Fixes: integer overflows Fixes: 46072/clusterfuzz-testcase-minimized-ffmpeg_dem_MATROSKA_fuzzer-5029840966778880 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/matroskadec.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index d97fc33d44..069fba6cf7 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2886,11 +2886,14 @@ static int matroska_parse_tracks(AVFormatContext *s) mkv_stereo_mode_display_mul(track->video.stereo_mode, &display_width_mul, &display_height_mul); if (track->video.display_unit < MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN) { - av_reduce(&st->sample_aspect_ratio.num, - &st->sample_aspect_ratio.den, - st->codecpar->height * track->video.display_width * display_width_mul, - st->codecpar->width * track->video.display_height * display_height_mul, - INT_MAX); + if (track->video.display_width && track->video.display_height && + st->codecpar->height * (int64_t)display_width_mul < INT64_MAX / track->video.display_width && + st->codecpar->width * (int64_t)display_height_mul < INT64_MAX / track->video.display_height) + av_reduce(&st->sample_aspect_ratio.num, + &st->sample_aspect_ratio.den, + st->codecpar->height * track->video.display_width * display_width_mul, + st->codecpar->width * track->video.display_height * display_height_mul, + INT_MAX); } if (st->codecpar->codec_id != AV_CODEC_ID_HEVC) sti->need_parsing = AVSTREAM_PARSE_HEADERS;