From patchwork Thu Mar 17 23:30:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34827 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1357162nkb; Thu, 17 Mar 2022 16:31:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpkbEHO98vTGe3iKXc5CZH5oH6JaDANFMez6P2rLdAd4mFd2VOmrdHuXk6lEUjDS8TS7/1 X-Received: by 2002:a17:906:99c4:b0:6df:892e:cdc6 with SMTP id s4-20020a17090699c400b006df892ecdc6mr6577965ejn.384.1647559904169; Thu, 17 Mar 2022 16:31:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647559904; cv=none; d=google.com; s=arc-20160816; b=D+d4T+rmQS+BCV6ZgjlaHxH+1gAOBjB3SdLxLHFeE/ILPJ09kjfqTPjLoJPFAThc2m 1yH5ZN0bZewSccUwgRTOa/z41TRM20/KWgzKxgE6c0Xs2LSCC5Ngkk/M6R9pZ/fQj3lr sSEx6l3py4nzooJRmJTZYs18MHV2qf9lLzGhS7hrZvTiZ9CWtdRi7hhXxLfiDtT2YVr1 iDqd4exVUhqzQe3k9PzJ8/LiXMYm94c6jMzWJXvragbk9mPhfJJE4P99WQD6cGzGjTOo h/Lx0NatnvVl9ZVPqjdlwM5/ZLwfnA+GQaGe2dlu8tzW1zhJTRUPiSmM8R2/+diBY8C7 911w== 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=vcq9izMkAXAzNOvF/sBc0I2KLLlhLOMEKP1CQv6vO8A=; b=0WIzzmF+TmhRpnteyrNLKYC8hqCTUZ/hobrRhJTVj+scKR23Tc7w68BxxSlmQWIjP+ xC0cfz7J6T/oISn4C0xlkitt5+L4le0mR0UxwBCzx6toWSHzU1WPfabVSQgrpaxHIhtn u/bgyWyNOsgOrUHHZGKUYF4fuFkKgabINJTbLtCjRzw00jD8kiSytwjeE+ece37SedEs GvAl2s8E7LZMnf5QytH1Y6F5VSi2qQVglO5+0Y7yo524B96Y98HmMuA3jj2eTRdpzf9A I+NaW0fR25ST1OUiirSr6Rto4roGIz66Oq2KMnjf8ab0zdPL4SlDBQlUT/vu/Ev5q94A 1xyA== 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 g3-20020a170906594300b006df76385d32si310309ejr.466.2022.03.17.16.31.43; Thu, 17 Mar 2022 16:31:44 -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 04EAB68B0FD; Fri, 18 Mar 2022 01:31: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 6269068A7AD for ; Fri, 18 Mar 2022 01:31:35 +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 1nUzah-0005fL-1d for ffmpeg-devel@ffmpeg.org; Fri, 18 Mar 2022 00:31:35 +0100 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id UzYynjWdKSgGFUzahnDT2d; Fri, 18 Mar 2022 00:31:35 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id UzZUnynmz8eSWUzZUnuNCR; 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=KKE5sHJo 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=0VC9p01ngVQWEUDz2AMA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 18 Mar 2022 00:30:17 +0100 Message-Id: <20220317233019.12049-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfADZao04jaWUC9mEIwchpYE6TLe93iBSzG+foYoQAgeq1v0xPhJqLgDWOpj4gHiLV8+3bIgacFniLulfkQzDOtKKEtD6A+xHMi2NCN+65kPejwG9A1q1 0G0UHugXwk7jQiknHgCVepEOHrDX3tIMliIHk5Q/g0NCyuxaVwwsFKC95DQFGZP5v28ANbaQDLaSvQ== Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/dfpwmdec: Check packet size more completely 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: B7Nv6A2KfAmk Fixes: out of array access Fixes: 45497/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DFPWM_fuzzer-5239786212818944.fuzz Fixes: 45510/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DFPWM_fuzzer-4947856883056640 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/dfpwmdec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/dfpwmdec.c b/libavcodec/dfpwmdec.c index 27b60a4ea4..e11f393ee4 100644 --- a/libavcodec/dfpwmdec.c +++ b/libavcodec/dfpwmdec.c @@ -106,7 +106,10 @@ static int dfpwm_dec_frame(struct AVCodecContext *ctx, void *data, AVFrame *frame = data; int ret; - frame->nb_samples = packet->size * 8 / ctx->ch_layout.nb_channels; + if (packet->size * 8LL % ctx->ch_layout.nb_channels) + return AVERROR_PATCHWELCOME; + + frame->nb_samples = packet->size * 8LL / ctx->ch_layout.nb_channels; if (frame->nb_samples <= 0) { av_log(ctx, AV_LOG_ERROR, "invalid number of samples in packet\n"); return AVERROR_INVALIDDATA; 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; } From patchwork Thu Mar 17 23:30:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34826 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1356760nkb; Thu, 17 Mar 2022 16:30:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJmpo4ZBiHORIs5x7HUGL25rowZ5CNL5vH3NQEfIISKuqQGzgX4uRskIhaAgl4zd6VE8xz X-Received: by 2002:a17:907:3f25:b0:6b0:5e9a:83 with SMTP id hq37-20020a1709073f2500b006b05e9a0083mr6882595ejc.659.1647559856477; Thu, 17 Mar 2022 16:30:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647559856; cv=none; d=google.com; s=arc-20160816; b=iEs3nxWTBABTIexDZ4/vI96bIoQwYzM+qhdN9K93N9jw3UxBFztgVu66FwAZEwhIqp FiMbvAd63H0xVPo/p2BCJQZDOgbY6B1+QTwMTTDUG4jZqBRpEYGv7eges+tjtRb8YrTy dPtv9xu9gigfvFqmkGNc+YGFudcQfELxUq70IJm6JABNW3c7Kzb/4hrVtjjqe2TbqanZ bvPN3k981vpiimjHwqGdwZM8zipro1W4uhvIbpF6Bilv3dBzja+hUHUa0MHAFDlnIJ6u 9moQR4iVSZo8c1Ll80wHwodLDcfJCjM4trVYP19su6DO7xZe8xmaknqWXAutr+yd2L0S ntmQ== 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=apuoazmoW8MytPmdGvXblF+yWXu4zHUZAGEwQBnF5S4=; b=VH6DIBV50lcLIkeaQV+bkgt1YPyz7dPZbBbjkmYhWSy1GuefcjxnZUnuGsQ5QtBZSH DogF1bFiknaIVKcibWvjfTfAd5T4DNEOLU1TGwYP1ZN0LLnSgqm/yclpxTC6RYlA6ygs fzjyk+cjxHsMnixIa5Mo1NXomqARk9yz6sUwA45LoDtGCPR+JjDJ/Z4aTE1l9M5yMSOH D5oxpQQB0oaclVXe8R8BOLLK1p0ajFrJFIjgNvdck1+8MM78rC0RDwvY2V//wVRYmqVF tmUq0rmKof4XEk05G53OFS2dYW1v6Ru4i6eX4RnMMHfapmFaTMesDecpQxugynQCjoRh hqng== 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 j17-20020a1709062a1100b006df76385d29si285607eje.457.2022.03.17.16.30.56; Thu, 17 Mar 2022 16:30:56 -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 E4D4368B109; Fri, 18 Mar 2022 01:30:43 +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 5FE7368AB7C 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 1nUzZk-0005fL-0r for ffmpeg-devel@ffmpeg.org; Fri, 18 Mar 2022 00:30:36 +0100 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id UzYynjWdKSgGFUzZknDSzw; Fri, 18 Mar 2022 00:30:36 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id UzZVnynnN8eSWUzZVnuNCU; Fri, 18 Mar 2022 00:30:21 +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=KKE5sHJo c=1 sm=1 tr=0 ts=6233c49b a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=Qfvzsn7T5tuE3-kr9agA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 18 Mar 2022 00:30:19 +0100 Message-Id: <20220317233019.12049-3-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: MS4wfLhp2yyXuOi044Nb95kO+1Av1nDobRYauJhjBILEOvx7kdJUyteM1z9j0GSjMZ/mWf5yWSmg+KrQIRC2wCVh8vUueIuM8XnrKD+R+WVqEsCnsG90PsUy s3aAKSfH0wz20VFhsFbHfJf9ajM8+VasONn5jb/WXyvDpQ4rg32eVkFzYyXnd7+l4unjtGSndTotFA== Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/alsdec: Set channels from data after data is set 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: JqVR0wzXzyJ4 Fixes: out of array write Fixes: 45624/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ALS_fuzzer-6473487382872064 Fixes: 45626/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ALS_fuzzer-4874997192065024 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/alsdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index 822cf211b0..73af829178 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -1986,7 +1986,7 @@ static av_cold int decode_init(AVCodecContext *avctx) unsigned int c; unsigned int channel_size; int num_buffers, ret; - int channels = avctx->ch_layout.nb_channels; + int channels; ALSDecContext *ctx = avctx->priv_data; ALSSpecificConfig *sconf = &ctx->sconf; ctx->avctx = avctx; @@ -2000,6 +2000,7 @@ static av_cold int decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "Reading ALSSpecificConfig failed.\n"); return ret; } + channels = avctx->ch_layout.nb_channels; if ((ret = check_specific_config(ctx)) < 0) { return ret;