From patchwork Wed Aug 14 14:34:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 51017 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:a746:0:b0:489:2eb3:e4c4 with SMTP id f6csp958207vqm; Wed, 14 Aug 2024 07:34:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUzNMyhnKNhUGngx1vHQm2tMjMH1k04EpP/PhQ9QpYS8CYDo2DdRGGQiCpukqzgnP0BVwVzRNZWff3vkciP5SRD@gmail.com X-Google-Smtp-Source: AGHT+IEpwhEGqxNZMqn7ciNeLjCWPV6HVA0hsMn5G3TWTMBFqrbFCxlnHLYn8jyqpGAaVhJ4+ZJA X-Received: by 2002:a17:907:7214:b0:a7a:9f0f:ab1b with SMTP id a640c23a62f3a-a83671523ebmr116049566b.7.1723646094525; Wed, 14 Aug 2024 07:34:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723646094; cv=none; d=google.com; s=arc-20160816; b=Ew10KXNoaxBZeNzrvJczOUz0e71uwNbZFstuyCMigflbqLsoA4KcupZLixfnqbIqFq /JV627WJytGxMtXgKR1lw9WWCc35PMFRAO8kQFURJph90GIZDbK9V/LQjCV43a66FE+R cjqxXjvY053g7wDHHcJRfznVKvLZc0fgCNzXVhNV48e1SX3ntT0thp8xlMWLLjey/3zC HfpsncVDB2V0jiPOemZMNtYtPZpI5pcS/MPI9T5mevt1sLrGNoAJcOglJzNnf921GQYa evs4N2w1nMcFLWVFNS4XhzXi5XNe7V1g5WXMVXjvBv1jmQje9kQYpTQjXnbb+Vc0mCPB UXIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=f/tXjDbp3HcWwSIhF2ZMGXzAAUJs181VgT2UpcVD3BE=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Q/NzYz6uav6jAo+17oSOJBv5kyEslf/LoATiFUPqF1YAi8TI9aP5uYcZt6EHf5KuSQ 1NiWu5asvadQc8OYgBLotGYF4sWeTmit3BaTy5LUAJHlpB4cXdtYM4kkkd3pS98vw7Wo OUsti3jve7fegRdcDYIcggCRZZigdyQ/M7ChmA2KIrz81nkeyxeU5qbbkOppekLXYogv HD98gLIy5t7Ph6krHWcgPEMsgeEXXh93SxzNELKmjuz6E1lFTUUkA8k9ot+SXyjLiM6v 4AJ3JpOWjYEq3J3DJTLrA1vsBXhgc1P8r+XGKvEcgJu0RbIjD/1G5TQTe4/9j++ZBKre BOIg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=EMfFlb8J; 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 a640c23a62f3a-a80f41ced69si230593166b.1037.2024.08.14.07.34.53; Wed, 14 Aug 2024 07:34:54 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=EMfFlb8J; 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 A5BFF68DB77; Wed, 14 Aug 2024 17:34:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 739EE68DB68 for ; Wed, 14 Aug 2024 17:34:24 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id B673C40004 for ; Wed, 14 Aug 2024 14:34:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1723646063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1jwqWsuF1T7KuFEj8rMXN7EI5OMfOvXRF2yDDYb/82I=; b=EMfFlb8JR9TZelTL+T9ESmuQW03Vt0CzyAuz8MFR8CNFPsWXgyQUtjS9F/rJ4WbdO7zgUL a2ysTV+0REuYF6hZFPftlF6mU3vd9ihaRFHjhv3IH8kZ6t9z2zql3OhRTBzFu10aaEo5I7 8KTv5yiUsJ90zMyM2Us0eJmFiRIErwid8Rch3uAzh9DC1GA+iw0JbJ/gWw3J5ClrnEVHLF dM7v9WtLqTSZSf5UqXL4VlvubmkSZKQ7sFAi84TEgZZrjgYyymrzlqdNAg+BEKzQ543LxP Fb3aQMwZw7I2r1f6hiUPfo3EQBw2lB4CEgDnCbyLxTuUgtKyuRiD0070HH7drg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 14 Aug 2024 16:34:20 +0200 Message-ID: <20240814143421.3990034-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240814143421.3990034-1-michael@niedermayer.cc> References: <20240814143421.3990034-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/3] avformat/mxfdec: Check that key was read sucessfull 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: VFDxl4E+bl8M Fixes: use of uninitialized value Fixes: 70932/clusterfuzz-testcase-minimized-ffmpeg_dem_MXF_fuzzer-4870202133643264 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mxfdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index af0c8a31007..4d5cb28d6dd 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1533,7 +1533,8 @@ static int mxf_read_indirect_value(void *arg, AVIOContext *pb, int size) if (size <= 17) return 0; - avio_read(pb, key, 17); + if (avio_read(pb, key, 17) != 17) + return AVERROR_INVALIDDATA; /* TODO: handle other types of of indirect values */ if (memcmp(key, mxf_indirect_value_utf16le, 17) == 0) { return mxf_read_utf16le_string(pb, size - 17, &tagged_value->value);