From patchwork Fri Jul 13 17:26:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 9715 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1001187jad; Fri, 13 Jul 2018 10:27:26 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdw519nw6lLOcfL5xzhpxJbr0zUoHgbfhJLFNF3josof/KR045fdEUWPu/yPVshc2g7Zf7m X-Received: by 2002:adf:a197:: with SMTP id u23-v6mr5968124wru.50.1531502846472; Fri, 13 Jul 2018 10:27:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531502846; cv=none; d=google.com; s=arc-20160816; b=eQTP3k7DgpFgh0nOOrbg1j7sDQyNE7SK8K1ruRqP1fLvcNuAO+so+bvEbsbPl/7sd7 IZL5o7+/9peB5NeQSojKiFB7ys+JJiQVn2SENiPDfQv4K0QUKw16LOzFNi4UpyfKAPk8 3CoYd0JkLKnVGXXvx1sHM61JzLO3UfW7v1sMDi0x9ZawFs1OOuyg0xVAOAnOL//eg7Iv J/KKi9W1RM2TV5U7BGoo17sm2k/JZbTLq5Jmd0OlpWTZJwmMM77p8XtRaPQRInaMOYZ3 ePiDkLGbkDgAphhB469/TKGdUL2JRBJPcSIZ0dNAvGK2wnlofh87f2SHlxSwuFzt6i/R mUdw== 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:arc-authentication-results; bh=X1KkEq5ErnQMQrHYInBHffdOla6SDJ/zPygQ+EgMwbI=; b=KHSyJAIx3SOE/7YYv88f2zEgKF342EefZ9d6m/VEs2OgzOOTgc90kih5O6zxFYLk1I oEBxkF5lcFS0PvE57KL2REyMrGNUzN6cg3n98H3JRGpRYOF+e2/+lyXpwpeD3U2z1/O8 A8j6fDMtNWxYWyyKD8XaJVkRAh2M6vYEKHz2lByM29HTYb4gqFA0ID79oJOKk0u3ff/s J5g9SyMTvTRqnaB3xs1w3t6rzmopjXswvrmgy5dD7HFdOFvZIHyo5i0NsNaDF5cZ1Xw2 sHYNS6C8w/ZAAaUsijGhbfyLqmJEViDLya23iKp7a/E3He1sFqNnYw19FunlkzANDM9i kF+A== 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 g12-v6si17383869wrr.281.2018.07.13.10.27.26; Fri, 13 Jul 2018 10:27:26 -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 B4C7A68A6CE; Fri, 13 Jul 2018 20:26:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-3.mx.upcmail.net (vie01a-qmta-pe01-3.mx.upcmail.net [62.179.121.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9546E68A6AF for ; Fri, 13 Jul 2018 20:26:53 +0300 (EEST) Received: from [172.31.218.43] (helo=vie01a-dmta-pe05-1.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fe1qQ-00031J-75 for ffmpeg-devel@ffmpeg.org; Fri, 13 Jul 2018 19:27:02 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fe1qK-0005rC-RK for ffmpeg-devel@ffmpeg.org; Fri, 13 Jul 2018 19:26:56 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id AHSq1y01F0S5wYM01HSr4v; Fri, 13 Jul 2018 19:26:51 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 13 Jul 2018 19:26:40 +0200 Message-Id: <20180713172640.19675-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180713172640.19675-1-michael@niedermayer.cc> References: <20180713172640.19675-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/dvdsub_parser: Allocate input padding X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Fixes: out of array read Fixes: 9350/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DVDSUB_fuzzer-5746777750765568 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/dvdsub_parser.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/dvdsub_parser.c b/libavcodec/dvdsub_parser.c index 8e1c48bef6..698ccb6987 100644 --- a/libavcodec/dvdsub_parser.c +++ b/libavcodec/dvdsub_parser.c @@ -57,7 +57,11 @@ static int dvdsub_parse(AVCodecParserContext *s, if (pc->packet_len == 0) /* HD-DVD subpicture packet */ pc->packet_len = AV_RB32(buf+2); av_freep(&pc->packet); - pc->packet = av_malloc(pc->packet_len); + if ((unsigned)pc->packet_len > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) { + av_log(avctx, AV_LOG_ERROR, "packet length %d is invalid\n", pc->packet_len); + return buf_size; + } + pc->packet = av_malloc(pc->packet_len + AV_INPUT_BUFFER_PADDING_SIZE); } if (pc->packet) { if (pc->packet_index + buf_size <= pc->packet_len) {