From patchwork Thu Jun 9 00:05:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36093 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp72720pzj; Wed, 8 Jun 2022 17:06:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwgYuOWV4DqiI30ts/fP3aIS1hA2nCKMrpCHX44EYhFaIQMOMcYiy96482ZPA9w0NL0rHdM X-Received: by 2002:a17:906:64d6:b0:711:fca6:bc2b with SMTP id p22-20020a17090664d600b00711fca6bc2bmr3784336ejn.197.1654733192280; Wed, 08 Jun 2022 17:06:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654733192; cv=none; d=google.com; s=arc-20160816; b=hUY2rSzyg8zqHcAPQnamFUbUoI9GzWFbNjAJpHKfAsCjeI7RGzvERBCYr5S1jGni+Y iPBZCzjjY8CrnoHYrSImIVlyPj4QRst7AEVgvFLy52vQLJCGr1UEJ84n7wUwSIu4eVPx 7o17zofu9UjUennd+/Hn7u310OV6ght1rM843yeO40Rb6lGcQVaAsYDdezFRL/Gex4fE QRttpRwxqSrbYZiIPBG0gl6L2nS7gWZHIgfjmVa6cURePj22ZHDCNOrQW7HwLnKsYY12 O0RGcoswjuEAzC5QhDfA52/fWTujl5zunFSOxw+bEmivZ66+kQ2PCKkCgtWcMMJalFeA uRIA== 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=nOOygYyE7uEJuzM9tR86ZOgkd4hsG/uniSJmsQjfOqo=; b=XtdVRJwWxdAP2ZhBGUlzzGvJc6CQahdGf89sKfb6CXHE4LM3OMqId5XMmVhy4RkXFq EpN6CLXr/t8xWASra12qdvZG0hx5XEikteMhg1D/HWy7BXWH7KVukaouQ6XtA0eDuNF9 wzMFJdIk0UfEWxAFIdVv32IcUOieHmSvOkQ2sBHK9UmnqhBxDkZjYZhFN+Rdyyfq3xva GiB50GnnXxVkQtEmH0ig2VE3bCNNvbSTXW3BhvTxSIRu3o2AQi8Vlfq0zCWOIuOR0ruu GBCLJuDedFlIm5ySREbz7JUDOIoDnl26K7jtfomQnkmC8JYdnSM2iY/LQJhX+vG7miD4 0CpA== 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 hv18-20020a17090760d200b0070931a70c9bsi4628180ejc.293.2022.06.08.17.06.08; Wed, 08 Jun 2022 17:06:32 -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 644BA68B6EB; Thu, 9 Jun 2022 03:06:05 +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 AE6A068B364 for ; Thu, 9 Jun 2022 03:05:58 +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 1nz5gN-0009MS-3u for ffmpeg-devel@ffmpeg.org; Thu, 09 Jun 2022 02:05:51 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id z5gDnvig88s8Uz5gMnDs8E; Thu, 09 Jun 2022 02:05:50 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id z5gKnNTSXOPqFz5gKndJJK; Thu, 09 Jun 2022 02:05:50 +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=62a1395e a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=5KAme_eNuml5hB_NUyUA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 9 Jun 2022 02:05:48 +0200 Message-Id: <20220609000548.14180-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfNRmqC5wJCpx1pJ7gQwwZ+DnjuYuObvpbNY+APe1X5XQvL9IJ6EJ9jM2+ovv0yNDEOEfEO300uC2HzG9Ib6C/7wNo0YFosDf9i6gsSikmu/kxXxhmB0E JVwjX4SzlTA5RtWAE3p1ZSlCKyaJpCsfKe0R9FFOm/33O2hb7fBUilBwnMt2UnPx+zZHmYCqk9xKoA== Subject: [FFmpeg-devel] [PATCH] avcodec/flashsv: Clear pointers 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: m/E4tloKtpt+ Fixes: Use after free Fixes: 47399/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FLASHSV2_fuzzer-5718646686613504 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/flashsv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index 0982161d49..5ea7e56dd5 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -346,6 +346,9 @@ static int flashsv_decode_frame(AVCodecContext *avctx, AVFrame *rframe, if (err < 0) return err; s->keyframedata = avpkt->data; + if (s->blocks) + memset(s->blocks, 0, (v_blocks + !!v_part) * (h_blocks + !!h_part) * + sizeof(s->blocks[0])); } if(s->ver == 2 && !s->blocks) s->blocks = av_mallocz((v_blocks + !!v_part) * (h_blocks + !!h_part) * @@ -554,6 +557,7 @@ static av_cold int flashsv2_decode_end(AVCodecContext *avctx) FlashSVContext *s = avctx->priv_data; av_buffer_unref(&s->keyframedata_buf); + s->keyframedata = NULL; av_freep(&s->blocks); av_freep(&s->keyframe); flashsv_decode_end(avctx);