From patchwork Mon Mar 28 19:12:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35024 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp467898pzb; Mon, 28 Mar 2022 12:12:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1TC7sk+grp1C6Yn8GlY3REAPa2cYEcvC7oZvQypOyxyWLFy7ia6iNtMB2iaKUsRnqfIdg X-Received: by 2002:a17:907:97cf:b0:6df:846f:ad0a with SMTP id js15-20020a17090797cf00b006df846fad0amr30077019ejc.286.1648494779101; Mon, 28 Mar 2022 12:12:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648494779; cv=none; d=google.com; s=arc-20160816; b=y9EmFWL8KEnEv4hv3yHbrSoEIhCUjNWyfR72z1Fz4uqQcf7XcyQCQWI8Ae41XqJAua uDvQ9RjsSwOnycUVYYpzFHArJkz0HqMK/PHqUEXkg3GsgMMYFbe7Mm8rA6BWBvm6qbt+ YCTaW3d5WCP5pXoTq4nyLekxAGWxY4df1X/Rgui/r21BgoeP6UiQ7RzG4UuNyAylMmMr +UDI+Ek7tZZwPYEPVZJ49IUfKfy0Hdf35UjRPtOSFmN/mRpi4WZHQl+oeVgaMnC9AI2R ftk50DK2zpt6//0nGFkm6Rkk8fmb7HanTZ9buclNwxj5s6AKiBbRwlmF81Kr1P5J0Hyl +eFg== 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=webJ3GIEc3B2L/hGriGwlgG9AB5dI01r7ZBlGZKV4iM=; b=ckhM2CgC5GhSw7uZvBOu96PEqdedpO1C9uXGi/PNhGSY3CRVeo7eYgEtobyuHDPMCQ QeKjGhDAsFqypVJryCitviIwOOx80BduIMTGGIbcKpi+RsjyLbCrGaPLJxrMJdsJhXwd bHLA774JI9FVbt+vQLM5JtbLvQkKrTQZppB1iYO0VhcSkXb2YZHRMeGbvZiwvdO5nyv4 zE2acuq9nnPDvGWQv2fzw71b2OdI3jGw1CO1YUInl4k0+awGjb0Q5gbBnPkyjN3eOgUq 1XhbBMThDlrhgCzVK9AvgsXmTjq/oUwond3t8P5k+grZ/vwmqDlhNVoe1rRwCk+c4Poy P5lw== 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 z15-20020a170906270f00b006df76385d2dsi15529505ejc.461.2022.03.28.12.12.58; Mon, 28 Mar 2022 12:12:59 -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 426BD68B280; Mon, 28 Mar 2022 22:12:56 +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 C92B768B24F for ; Mon, 28 Mar 2022 22:12:49 +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 1nYunD-00020a-AV for ffmpeg-devel@ffmpeg.org; Mon, 28 Mar 2022 21:12:43 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id YullnGZEuSgGFYunDngBwm; Mon, 28 Mar 2022 21:12:43 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id Yumxnh69fOPqFYumynQ44V; Mon, 28 Mar 2022 21:12:28 +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=624208ab a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=hh7fCMspGFQWuEw-g2YA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 28 Mar 2022 21:12:27 +0200 Message-Id: <20220328191227.25781-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfKOFxZlNyGQ6VzTBSuxQQaGHIzCl04Rne1omH5UdynHleEUZtkCs6ghfE2wA5cSOwdjeVzx82YyHeUJ7ngxC7Sdlchu2LHnvW3rn/uJ9CZI23LVaSivk vM6ETUdVPMUSxz8K4qeKekDvnjxPdlsWnxmmEtTC+ZJ1BT+GIyy0a5eZomzIUVkU6DdPzhDl1u0xUw== Subject: [FFmpeg-devel] [PATCH] avcodec/binkaudio: reset ch_offset on errors 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: AOCy8XfS2rUe Fixes: NULL pointer dereference Fixes: 45955/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINKAUDIO_DCT_fuzzer-4842044192849920 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/binkaudio.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index 56b58b57c8..c4f3e743e2 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -329,6 +329,7 @@ again: avctx->codec->id == AV_CODEC_ID_BINKAUDIO_DCT, FFMIN(MAX_CHANNELS, s->channels - s->ch_offset), s->ch_offset)) { av_log(avctx, AV_LOG_ERROR, "Incomplete packet\n"); + s->ch_offset = 0; return AVERROR_INVALIDDATA; } s->ch_offset += MAX_CHANNELS; @@ -347,6 +348,7 @@ again: return 0; fail: + s->ch_offset = 0; av_packet_unref(s->pkt); return ret; }