From patchwork Sat Jul 24 21:52:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 29046 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp2511447ios; Sat, 24 Jul 2021 14:59:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwT2gLe0FAgHwoj/vRDzfxsHJc9Ma6bkXN5M4tuPfnQ03nsv0VJPwym9TlTwo+DrV8mSa8e X-Received: by 2002:a17:906:7190:: with SMTP id h16mr10596562ejk.251.1627163972540; Sat, 24 Jul 2021 14:59:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627163972; cv=none; d=google.com; s=arc-20160816; b=lTNHfPOqEQJMxlwvxnWnk29KEShnSNHDSIpBc26df6jRBfX0cUrjXSlLKBB01CZq42 ASsNJKkVMDbFQRDyFj6Lt1obI83jcvXNGYZaql4czMukGjAqqQ/KV5bRjjfO9K0Uq87X vyKit8nyT69Iqnlj0imfDpAO5kkoilb8ZfW7wr1HsI+duqIPW76XC0eNx2pCJOzZn6TB QTb1XpYGn+XzhHkrxmiZJF5npqIorDbd4RXXgsW8sZ6dwydvA8B3bEaNcDujY/t+TmKv VFE5/WcF5FLWaKzyrrT0sF1tlifaYUvYxVV4rybxojTqQkUB6IMlF4hkFHBPPW4rcNe9 jY7w== 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=5v7XaoCqxMW3veT2nrH4inIRYUPPrGYdXMR+4khgDV4=; b=TVEDyyw9sadGV1kt1s/pGD7ERyXzFrRUevCiasLXkD4G2ncCo5meHo8rDp+BgnJmW4 L/dG//C+aX3B3CdBJd2SPcETTVM2Ln5fzIBlh/wu3Ik8o+5qgyB7vpBRw05JeHz2Ph3m eNMT2R3UIUktMsSrJ6oWk3Bej9JAGGhxUm1daf0PZPTthwgmZ3iDJNPRYDZKHcRv5sx+ lxK7eyuMk32fwx6EUArw/KAS5yFdE82eA0qpeht8aqsfr2l4KnAcUNy/oluG3Vd2zdSt tsEnat4R7lZ0+d3lcD4i6i5y0uB07+KyGJArlu5RTjSOgv7/zqtxOH9eu4kO7B1AnIZ9 admA== 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 o2si32174493ejy.80.2021.07.24.14.59.31; Sat, 24 Jul 2021 14:59: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 DF03568A5C0; Sun, 25 Jul 2021 00:59:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-1.mx.upcmail.net (vie01a-dmta-pe03-1.mx.upcmail.net [62.179.121.160]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C9D1689FD1 for ; Sun, 25 Jul 2021 00:59:21 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1m7Pae-00BVLI-0E for ffmpeg-devel@ffmpeg.org; Sat, 24 Jul 2021 23:53:48 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 7PZfmzyrhljeH7PZfmsgsm; Sat, 24 Jul 2021 23:52:47 +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.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=x3KRrDSbJYOElIRVAKIA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 24 Jul 2021 23:52:47 +0200 Message-Id: <20210724215247.20107-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfAd1Yoh62kr1oAYPNk2skTNu/F4659EQE7WKbkEiPibUuvNjEFD3yLVh7FnwYTNBZsUiZH7ApROnoS4GtrKHmRXesL1URYn7bC5Ml+oXwHTlu7KCM99Y bwhQun9/2TxYu/hZzL0rN5iBSDoGbuGQQefVwrnvd4NMvC20XO79DdRU Subject: [FFmpeg-devel] [PATCH] tools/target_dec_fuzzer: Fix extradata duplication 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: lWt9xd73Lkbg Fixes: out of array access Fixes: 36340/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-5872546875572224.fuzz Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- tools/target_dec_fuzzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index 3e7689b7ec..843b447f83 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -317,7 +317,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { } parser_avctx->codec_id = ctx->codec_id; parser_avctx->extradata_size = ctx->extradata_size; - parser_avctx->extradata = av_memdup(ctx->extradata, ctx->extradata_size); + parser_avctx->extradata = ctx->extradata ? av_memdup(ctx->extradata, ctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE) : NULL; int got_frame;