From patchwork Sun Apr 16 16:48:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41207 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1838875pzb; Sun, 16 Apr 2023 09:49:17 -0700 (PDT) X-Google-Smtp-Source: AKy350ZSS6Ze55gMkPlN/SE0xQLO2+m7XSUgzLTusc2aY5A6/R20CMfZgnzQ7XfR3HmOPtleUGyv X-Received: by 2002:a17:907:3c07:b0:92b:6b6d:2daf with SMTP id gh7-20020a1709073c0700b0092b6b6d2dafmr4322783ejc.77.1681663756987; Sun, 16 Apr 2023 09:49:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681663756; cv=none; d=google.com; s=arc-20160816; b=yTEmVD7MtIeOXQ8Ifeh9h0vhfQXx39liZcoJ8bB11rPcsEJWcmmi8kPz8bArYzcVBU LdDoLZxody655iJZd6M3nFHZNZ8nzBxiYv+Fq2vF6dDFCuYgJBTM2zrx6dGm60pp+pcv bGr6ZQ4fb4C9kyDGvougMYyFTLvpCQ+VhCbUrSviwhh8ZDNoa8POYvuZpIlK7gmd/trQ 3Y5Ho//+o6/v/2Z4R5DAOzFMfyql75F+Iw3BaDHqdsyzDEmafx3uciJUc0u6aVnA6bGD P3sww33IWJeT7WaaeGo/Hs7nPyq5BFsxXijuDJuuE90c1MxdOAw+se3LL8xNzCv2rJbO VmwQ== 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; bh=0391rR0TbDsSP3IXQSr1ZMoFFZfrWCrctasLzb47Ly0=; b=s791wdOPJCl6xNx3/FljwuWshn1SVYmK38ljj9QE1nNBwKBLqGDBMkSN/ovdI8UVvs 8QhzfyMO1rAdYdu6bBgYM6RdUNQYTblXT0as8AofUN245Ocx3Q+5TO9xiNxyIye9YH9e gNAZL+tesScloxZ74h+akl+Ipg4KPeBrO0kG4eg3sMadYDZYkkXpLWpF94PBtpHttwnj eQ/0CPH5dZfckrRTIALbZIFGQMNmsGqbPWG+peIobUsxoyuRN+g2KRzS+kW0TuIwXu0p 87mBr3znCDkvKVIcBEdobwvF3rY/h5PBplFTExmy7AFEPJIpsfLNI5J3Qz45/w4z4JSs abSQ== 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 fp22-20020a1709069e1600b0094ef0b84fbbsi4518723ejc.77.2023.04.16.09.49.16; Sun, 16 Apr 2023 09:49:16 -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 3DF2068BD27; Sun, 16 Apr 2023 19:48:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED5CB68BD27 for ; Sun, 16 Apr 2023 19:48:39 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 2C9821C0002 for ; Sun, 16 Apr 2023 16:48:38 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 16 Apr 2023 18:48:23 +0200 Message-Id: <20230416164830.15664-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230416164830.15664-1-michael@niedermayer.cc> References: <20230416164830.15664-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 04/11] avcodec/exr: Cleanup befor return 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: pOC9Ehbt2Xqe Fixes: leaks Fixes: 45982/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-6703454090559488 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/exr.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 2f1766c17bf..8cc6b056b29 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1930,8 +1930,10 @@ static int decode_header(EXRContext *s, AVFrame *frame) bytestream2_get_buffer(gb, key, FFMIN(sizeof(key) - 1, var_size)); if (strncmp("scanlineimage", key, var_size) && - strncmp("tiledimage", key, var_size)) - return AVERROR_PATCHWELCOME; + strncmp("tiledimage", key, var_size)) { + ret = AVERROR_PATCHWELCOME; + goto fail; + } continue; } else if ((var_size = check_header_variable(s, "preview", @@ -1939,12 +1941,16 @@ static int decode_header(EXRContext *s, AVFrame *frame) uint32_t pw = bytestream2_get_le32(gb); uint32_t ph = bytestream2_get_le32(gb); uint64_t psize = pw * ph; - if (psize > INT64_MAX / 4) - return AVERROR_INVALIDDATA; + if (psize > INT64_MAX / 4) { + ret = AVERROR_INVALIDDATA; + goto fail; + } psize *= 4; - if ((int64_t)psize >= bytestream2_get_bytes_left(gb)) - return AVERROR_INVALIDDATA; + if ((int64_t)psize >= bytestream2_get_bytes_left(gb)) { + ret = AVERROR_INVALIDDATA; + goto fail; + } bytestream2_skip(gb, psize);