From patchwork Thu Dec 23 21:15:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 32872 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7621017iog; Thu, 23 Dec 2021 13:17:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJxIciJxNXTMZBwJy56OtemGcxX3pqMb8S3+ofpforJ3ySujV7hwdFCNlBd3enuShSTVzmR2 X-Received: by 2002:aa7:c641:: with SMTP id z1mr3527467edr.84.1640294220020; Thu, 23 Dec 2021 13:17:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640294220; cv=none; d=google.com; s=arc-20160816; b=cZ6MjKooZV5GtUJWR29cL1J251Z+ACVzuWstNLeIF5I8U1AAH/ELrkbTPEV4hQhT35 WbWotABjLnf/RIbIH8eXRhZbOlKVEEiCCpStNxRO3ggPwyQalWJUlslfCFh7Ne3Aolct T6zcqsPigaoTj3V4XV9UrtEy8OnGGrtwmPvgkRuIqlQZoZ9oabv8SbEMRhlUoUeiRF+3 zsT3cm4xSF1kZDzKjzPlDeE4dJ8VS/g4qgBq1omHpsZZjPgmxEvfBxOuOxEeb6DUbsby ys+hIiVENUhCUD2XnhuENEMKLTkQ5+tPuqsWy8jOoDRP3Mkym3831l8StcCUDImltY/j 0D9Q== 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=6nmASPaNK1V4oC6bnrVu70dO/bXizmfokwYY0D+M83w=; b=Ekr2ziFWhnZyOaeVKf8S8W7sL9N+QLQ7tUebTxw7g0fQ3WJF6QcJQMwY0OSge/TBLF Sxe2grxTMChwZEayMSJ8trv0vwCYawN7JoJpEQGXcbjkQ5FP5cU8j1w2tptV9mHcQpPV 0iyCElCMQoM98ZfzybdSTIvoFexxA2GVpWLP5pIA3FcWXJK2qI6ZpW6vcd5h85/dJcIg 8zsye/NbhHH2Q1E6LMoBmvp8bqyUkmWgodjPpYEUu9puE9/g17E/amAuUebEYa3p3qge aNIZ9wtBsZxcsMtJGRsO8oWyh1Eohcadf5W1J2Ul8YiuiD7hjHpFbR1/72GXl/DvAl8G TvXQ== 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 h20si2546958ejj.282.2021.12.23.13.16.59; Thu, 23 Dec 2021 13:17:00 -0800 (PST) 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 6CCB368B1CE; Thu, 23 Dec 2021 23:16:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-1.mx.upcmail.net (vie01a-dmta-pe04-1.mx.upcmail.net [62.179.121.163]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D7B468B1AF for ; Thu, 23 Dec 2021 23:16:28 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1n0VRs-00G7AM-0F for ffmpeg-devel@ffmpeg.org; Thu, 23 Dec 2021 22:16:28 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 0VQtnM8JWSgGF0VQtnabXG; Thu, 23 Dec 2021 22:15:27 +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.3 cv=f8Q2+96M 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=NEAV23lmAAAA:8 a=IGcOdrckTnUG_8ieB9sA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 23 Dec 2021 22:15:23 +0100 Message-Id: <20211223211527.20408-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfJcCTGtosQs0tcnrCF6utPh4b7FPGgQcBTTtlULIlnhbS2gmYLQdWZYQInFu+WDmgh5n4rl9VA0ffK1CvYlGu2+ayU9KSj0MgxWsGvDhjbPy77z3VKgc esBOUieu13Ozs/rN7/r3DF+TIEfB7FFZazgeK7wy20iLl22q29G4xW9u Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/targa: Check input size for uncompressed TGA before allocation 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: 1NVhIPBGhEQt Fixes: Timeout Fixes: 42667/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TARGA_fuzzer-5619236075077632 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/targa.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavcodec/targa.c b/libavcodec/targa.c index 221fcc956d0..b0048621d35 100644 --- a/libavcodec/targa.c +++ b/libavcodec/targa.c @@ -117,6 +117,7 @@ static int decode_frame(AVCodecContext *avctx, int idlen, pal, compr, y, w, h, bpp, flags, ret; int first_clr, colors, csize; int interleave; + size_t img_size; bytestream2_init(&s->gb, avpkt->data, avpkt->size); @@ -180,6 +181,15 @@ static int decode_frame(AVCodecContext *avctx, return avpkt->size; } + if (!(compr & TGA_RLE)) { + img_size = w * ((bpp + 1) >> 3); + if (bytestream2_get_bytes_left(&s->gb) < img_size * h) { + av_log(avctx, AV_LOG_ERROR, + "Not enough data available for image\n"); + return AVERROR_INVALIDDATA; + } + } + if ((ret = ff_get_buffer(avctx, p, 0)) < 0) return ret; p->pict_type = AV_PICTURE_TYPE_I; @@ -251,7 +261,6 @@ static int decode_frame(AVCodecContext *avctx, if (res < 0) return res; } else { - size_t img_size = w * ((bpp + 1) >> 3); uint8_t *line; if (bytestream2_get_bytes_left(&s->gb) < img_size * h) { av_log(avctx, AV_LOG_ERROR,