From patchwork Mon Sep 23 21:32:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 51774 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp2734820vqb; Mon, 23 Sep 2024 14:33:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU0sMKVTD+75Ey3vyMj23tlPhnufJS8h93Q6mx5Fgi85PoCz+Ir3OpPUJnGMqogjDislfQp4PEasybPM50qOOdn@gmail.com X-Google-Smtp-Source: AGHT+IHYV3VrFKk9uTmVQSMf0mAuALtLIvmfDmPtXFAsa5zBplZSXSZPgHwm8z9ygJkE4rDubJse X-Received: by 2002:a17:907:7ba2:b0:a80:f54a:f428 with SMTP id a640c23a62f3a-a90d4fc3130mr630988666b.2.1727127210264; Mon, 23 Sep 2024 14:33:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727127210; cv=none; d=google.com; s=arc-20240605; b=dS6CP5OPx8/XVZn3hp6zQyFcIrP9+xNWF0PT69+1kY03jeNK/bsYANOK/dJ9en36fA 8t+pz8PR6FJJKim6gEdMnq2PRH22QQkAbeek8odpd0UOz0ugVUochVMaVhDInvYjLDyJ bZlBAuPF9sAg7IQLYCgfsrOwvdXsv1bc+OL8DZZcrZf9uu/zxa2F9N3SWBITBdqbLQDo J0wTMbeTijvSmx2CfnCIeGYK3Eak7rLfHzvH0YjFum1r9+IydTD7ibziMUz7KKF90qDn anIJsCfhOKT56zerRo9Ure1G77Iaf7jJ06IA9ayDjmDi3XW/LrKOA95WMRIYuhLqRVu6 hlxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=uHXcxzRJ6EtGmoeofye8Bwv6ov7h/ZIGkkkUd9yXQj0=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=DUN6YtZL6z1tTOA0k7ouTcaA89820OsiZrzZhwjT8GUsDqW5FDI7WAvOqgR7uapv1/ vS7MZRzh84h1zN3TpNYiTwTjZeett8zZh1jSdIwd2GQcev5CqCCcpE/zMXRL5J+l5NlT 9f9tZv+maTCuBd3bUejjzhzPb5sie+6BAV935Xe9kHMmWMk6aJU9bi6ZmD4g05gns/iZ q6qxOj5tpfb9+cTOkWyXXiAI9mT8/Nhdi2/pgD0vcVU186/IbPcxTkOeic7DkbnfsiPJ K8LvP7lEhBi3LpDxaXWqdFPp0En8UvKswRObs40u4cD8ESn9w77gpNfVYQpUVV2OsflK LSlA==; 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=ZAYwGXWs; 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-a9392f2b874si2925466b.17.2024.09.23.14.33.29; Mon, 23 Sep 2024 14:33:30 -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=ZAYwGXWs; 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 1364A68DAE4; Tue, 24 Sep 2024 00:33:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B390768DA58 for ; Tue, 24 Sep 2024 00:32:54 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 03B46240004 for ; Mon, 23 Sep 2024 21:32:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1727127174; 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=d2yzuvUf2P0ZdjQMo/twjpuXYNankjoFluM/JNswiGE=; b=ZAYwGXWsUM0FqyxtQtdZdjd0+xTyf9QSXVkkCZ4/7KGbKdcR4pD2hlWwW68cP212Z+Rdi0 8rhdjsYy+yvxuhl7xRHiHGUpsi9G+xKJImEp/WU8KzgfUxtwufcgbJhiwlw3RHPpWIdie6 gBeq9nq3hq8n/NYfGNqZEFsOIm3yqLbVEr4+6LGFFeZl+0U1A9QC1/m1WlCXx83QnHDXQG HlpniAtAhXqGqXkxSW/wIQR/BzF4VMgNni9sC6JkO/wTNM2BWUmGdqrBqU0ZN/XKQjicuW sRHb0XxKSaPb74fWuZMS+1RTl88qZHTihxG74bHqaJ1/Tu574Uf2MleEFSmpsg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 23 Sep 2024 23:32:46 +0200 Message-ID: <20240923213249.3256534-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240923213249.3256534-1-michael@niedermayer.cc> References: <20240923213249.3256534-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 4/7] avcodec/eatgq: Check bytestream2_get_buffer() for failure 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: 1p74EB7ojTk9 Fixes: Use of uninitialized memory Fixes: 71546/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EATGQ_fuzzer-5607656650244096 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/eatgq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/eatgq.c b/libavcodec/eatgq.c index 190c57f1c00..57129dce51e 100644 --- a/libavcodec/eatgq.c +++ b/libavcodec/eatgq.c @@ -178,7 +178,8 @@ static int tgq_decode_mb(TgqContext *s, GetByteContext *gbyte, dc[4] = bytestream2_get_byte(gbyte); dc[5] = bytestream2_get_byte(gbyte); } else if (mode == 6) { - bytestream2_get_buffer(gbyte, dc, 6); + if (bytestream2_get_buffer(gbyte, dc, 6) != 6) + return AVERROR_INVALIDDATA; } else if (mode == 12) { for (i = 0; i < 6; i++) { dc[i] = bytestream2_get_byte(gbyte);