From patchwork Sat Nov 12 23:43:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39249 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1687912pzb; Sat, 12 Nov 2022 15:44:14 -0800 (PST) X-Google-Smtp-Source: AA0mqf4xO9PyzNr0tnJPDgXz2+sqdNfHSaQfgldUfc3zSZPR9tBvhLRKTnbtRLs3CiNuArfZ/VJI X-Received: by 2002:a05:6402:1946:b0:461:5877:3741 with SMTP id f6-20020a056402194600b0046158773741mr6712409edz.64.1668296653802; Sat, 12 Nov 2022 15:44:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668296653; cv=none; d=google.com; s=arc-20160816; b=wKR7rj74KxxFs0WC414UgJX9e8+ROwUXd5mNK1SOxWhFiWEE+hfsqA1rNzghr+NXBG zUdj5no0xpXKRUMTNTI8rixjlhF+HnlHYiZbPjYNN4UqgbD/Us/d3qqQpGYkYnVMyp3q 3o9Nhr5sLSpwEzp5AhTrIW1cd6EdQdvDN+YvJG5otmdGXwvLzmf4AN1b81QkHO+Hi0kf pG8ll4VP1UrSWqNahM6n2KChWGQiTz9koyrv0fN8r4EylZ6Gm1F70YcylP7WuL/9dGuB OnftMevjq7af/gfVA6OJQA4TXlgXNheel8J6CWdwxWggcRdGchFo78ioOqR87Nml1EL3 jSZA== 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=W3MbS0OakdmTKj3R8mZVYFi/T+oUdH84rnWmk5grz/w=; b=HM+kr6n7Mz/mUu+GVyvQ7IXbcHVO+J/3ZCY1k8+dlWCEPA9wmI8C6gnJENKd1c572v A/7eXz11rM3Hwtg4iB2Y/8+UHf4m8AESlU3d+wl6Y0gm46l1USPmAd5KG3Ybk0Qt8A8v eLLWV0lryzureuObM37PSivaTnlYHg/5nqkJwKHv67+NdLb5NBNUEjjgZrTp+XtXUKgm EtTFakGIBczAwHW8PaouSeTFSJ1UVbpSACUmqGGx7viidQTEa93t7Fu/24IwxSWdoXD3 GI2oElM5MTc2h9A+f1WHbQSIUQKEdPY8mBB4fT45p9ROpRRYWwwXhZRlHWTty7yufbM2 kEnQ== 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 ne27-20020a1709077b9b00b007ae0e8f59a6si6217578ejc.821.2022.11.12.15.44.13; Sat, 12 Nov 2022 15:44:13 -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 A155B68BA32; Sun, 13 Nov 2022 01:44:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3086A68A241 for ; Sun, 13 Nov 2022 01:44:03 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 34A08FF805 for ; Sat, 12 Nov 2022 23:44:01 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 13 Nov 2022 00:43:59 +0100 Message-Id: <20221112234401.24158-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/lafdec: Check for EOF in header reading 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: 0QRiwD3Okt+t Fixes: OOM testcase Fixes: 51527/clusterfuzz-testcase-minimized-ffmpeg_dem_LAF_fuzzer-5453663505612800 OOM can still happen after this as an arbitrary sized block is allocated and read this would require a redesign or some limit on the sample rate. Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/lafdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/lafdec.c b/libavformat/lafdec.c index 12b0d8540b..d02b479c4d 100644 --- a/libavformat/lafdec.c +++ b/libavformat/lafdec.c @@ -111,6 +111,9 @@ static int laf_read_header(AVFormatContext *ctx) sample_rate = avio_rl32(pb); duration = avio_rl64(pb) / st_count; + if (avio_feof(pb)) + return AVERROR_INVALIDDATA; + switch (quality) { case 0: codec_id = AV_CODEC_ID_PCM_U8;