From patchwork Thu Mar 17 23:30:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34825 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1356661nkb; Thu, 17 Mar 2022 16:30:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtNDIgPV97L2JK0BNIuLLvF88wt3GKMGwFiplk+QdtDcGat/LOQdTOuWwPaMKpInTwDW8e X-Received: by 2002:a17:906:3583:b0:6d1:c07:fac0 with SMTP id o3-20020a170906358300b006d10c07fac0mr6510618ejb.749.1647559847032; Thu, 17 Mar 2022 16:30:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647559847; cv=none; d=google.com; s=arc-20160816; b=ER0a+46FkwExHpfkY9MwZb76ntZWT5kIQNLpi6jcLhGs2IA9d51E8cqMKxeubbVHOx iP1P0nNutxV/eL1HEl5WqTb8jCEYj4dihuwWvZ9Oiw70xi26PLPRemOQkeGqQl9JVmV7 kfxebiGodOqnbfQ3zkdW+wLGZGI2FO7Usw/kJ/LToyN9lRzI+PB1c69IIEEcILlOmk7q 2dBYfL0TxG3bnK3ZoXddp9aVBIhWvWsJXPGCzicVVxSSmb+TB9tiimgDMPdoJZdbRWy/ Rl9169PxrBu3jXtbQ+mkLXiuz0NFwaEK4fqDd2emrybibi0oGwIRBIHkqDBuwHOBG6c2 xN7g== 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=M8swFtJ0vu1dEn3Z2+8cLchwUpng3B4ln0KjOlYdvAc=; b=c0Xq9oUbgfvHXVNk3BP93M2FXTYw9NRRx/6+h2zMeykABtmw3TasXEoxVo8nWJ5Xgt Ml8xjFgj0idHKpmNvcny7M4vyZlL2wewH1k/p2moTZxG3CFnO/7V/Btc+PlbcgWZ7vSx T6Xh1i1F851x5ZtbkCFbMvqXfNwXwIAtTf6deU2rpqb4sCLb8SSrK7kGPvMgM/Kv/29T 2sGdMDZ8tqpc+QcFWncERmHA6SIEGWFqs8cPsPxOJ68cX7HJSDgAISjPgmjIkn6JTyje Gtb2ZIlKt6ZN6ifiACc9yBv6XJ74tPDxgJ/qKuzV8wXupYSEjAqAcSBC+yH2cJeZB65S 7hUw== 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 1-20020a170906004100b006df76385bf9si307215ejg.153.2022.03.17.16.30.46; Thu, 17 Mar 2022 16:30:47 -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 E665568AB7C; Fri, 18 Mar 2022 01:30:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 334AE68AB7C for ; Fri, 18 Mar 2022 01:30:36 +0200 (EET) 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 1nUzZj-0005fL-8J for ffmpeg-devel@ffmpeg.org; Fri, 18 Mar 2022 00:30:35 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id UzYynjWd2SgGFUzZjnDSzm; Fri, 18 Mar 2022 00:30:35 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id UzZUnlR3qOPqFUzZUnGQuz; Fri, 18 Mar 2022 00:30:20 +0100 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=6233c49a a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=NvDUkrkaMzjMT35llvoA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 18 Mar 2022 00:30:18 +0100 Message-Id: <20220317233019.12049-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220317233019.12049-1-michael@niedermayer.cc> References: <20220317233019.12049-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKhZpHRxPyKCy2pvZZojVZX49judiBUj4ubBUXWP0QmIFxiBMUgf7RE9+KUNG8uPzRr9PwB22qaIjJqfM1OswshJnhFeSwhfAeXwf+8XPesieWe53LpZ HASFzfA3/yl2xHQ4/qMxryKkLUy/I/HQbLRxJ9GANq5n0odgvWeMGFsNpncihPWswLvYGSDSUj397Q== Subject: [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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qKkD9HBLUofK 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 ? + return 0; }