From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C3B6142514 for ; Thu, 17 Mar 2022 23:52:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6D37768030F; Fri, 18 Mar 2022 01:52:46 +0200 (EET) Received: from mail-oi1-f171.google.com (mail-oi1-f171.google.com [209.85.167.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1CAE6680AC0 for ; Fri, 18 Mar 2022 01:52:40 +0200 (EET) Received: by mail-oi1-f171.google.com with SMTP id q189so7290187oia.9 for ; Thu, 17 Mar 2022 16:52:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :references:from:in-reply-to:content-transfer-encoding; bh=1/sSgvkBqxd6QzR2ENFG/zx0kulAX57Zu43uxxCPk1A=; b=N33RlDVS2+kfBwzmJhp7R1mg59SmeSDxR3+8WNAtX5N00P4/n1zSOFyNnM6xPn5ReE VwMWkILAnD8S6VEDHKF51OwSzhah6BJNAfyNg1yXyRlaIC9iDlonk1kNDQLfDwNQjmSI 4E0HhC+FoZ0mxsv6Kkxm3kzI+KAL/uC5YsH99eqS+t8Txrh0FLZYWiDwgNhOICPFRNFE FvGyzzrkf9Ypr2ffOUPmHcFO83W8qdAMzWPqVmUQuXaIBsGImImJK1bAzLNXX/fklWV5 ZYiyR88S2V8huwX+jvZd1sUPljtju57SeZKVjLvamlMPASE9gaZ2GUi8kUAfRzcdCrVj //1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=1/sSgvkBqxd6QzR2ENFG/zx0kulAX57Zu43uxxCPk1A=; b=zTl8j0cyzMvXeXb6hP7T6D3UNfnFmFhq6MmmPqGyE44P917vkT4xGHWDO+efwquuXr XapScOQIF8T5xot7zVJxNHm90iZqz7ReD8yYo0mM4h7DgA23HZ2q+cmDAixu18z1S3R+ AyYplQfQWxeIDvDy82aZX71OnvY5/vl/X8HMSxtv4BLm5tGDkD4H9i/AYisySScd0nAT hix8BdIxd3sGp96NXgy97j694LvNWL0DLic7MKWqQglvRu5JwMqZrgC81oH9+fGs1ZH8 HMCNZtkyinIdRtdKtT/70Up5Tn/o/gBmDgmlO3JyPBWrxh+v5PiIOrUhHOXTeirX7sd6 Ey3w== X-Gm-Message-State: AOAM531btpm3y8xyOcpynSd4qVrC79GYFCoA3L+BMIlu9KXOtfUzL7Co 94WhM69kz7LVFielf9gM9/cW9FkAt/HAyA== X-Google-Smtp-Source: ABdhPJzduIQFb0QdvbjAxXgdEObNt5xA5TULhRwXys5PXEYsKZhWdcfXEq6Q6c/5MW26PfT7AIgp1A== X-Received: by 2002:a05:6808:1206:b0:2d7:65a8:65e with SMTP id a6-20020a056808120600b002d765a8065emr3149035oil.107.1647561158190; Thu, 17 Mar 2022 16:52:38 -0700 (PDT) Received: from [192.168.0.13] ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id w22-20020acaad16000000b002d9c98e551bsm3086414oie.36.2022.03.17.16.52.36 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 17 Mar 2022 16:52:37 -0700 (PDT) Message-ID: Date: Thu, 17 Mar 2022 20:52:36 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220317233019.12049-1-michael@niedermayer.cc> <20220317233019.12049-2-michael@niedermayer.cc> From: James Almer In-Reply-To: <20220317233019.12049-2-michael@niedermayer.cc> Subject: Re: [FFmpeg-devel] [PATCH 2/3] avcodec/wmalosslessdec: Check channel mask against num channels 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 3/17/2022 8:30 PM, Michael Niedermayer wrote: > Fixes: Out of array write > Fixes: 45613/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMALOSSLESS_fuzzer-4539073606320128 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer > --- > libavcodec/wmalosslessdec.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c > index cd05b22689..1728920729 100644 > --- a/libavcodec/wmalosslessdec.c > +++ b/libavcodec/wmalosslessdec.c > @@ -281,6 +281,9 @@ 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); > + if (s->num_channels != avctx->ch_layout.nb_channels) > + return AVERROR_PATCHWELCOME; //are there non fuzzed files with this or is it an error ? s->num_channels at this point is set to the channels count the user set before calling avcodec_open2() (Normally from lavf), but it could be anything. If channel_mask is taken from extradata, maybe it should be used to set s->num_channels instead of aborting because the user set value and extradata disagreed. Also, can you reproduce this crash before 3c933af493? s->num_channels was being set to the user set channel count too, same as now. > + > return 0; > } > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".