From patchwork Fri Aug 16 23:11:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 51043 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b6ca:0:b0:48e:c0f8:d0de with SMTP id s10csp731588vqj; Fri, 16 Aug 2024 16:12:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUm692Ay5+tUhlH6UMCOgehiWvc96oAlh40ICt/OMGg/QaGZ0WSpKK0RIj482QpZpZ+z3y/uL2Nu4vAABkQgJWUsTzET/KEBITFiA== X-Google-Smtp-Source: AGHT+IF8jCICjY+jC+kiuK9y9QYqQyuuj0RhiSmeit9LSy8A0aXHyPtsgK4URyr6Z8iUML/6ATDf X-Received: by 2002:a17:907:2d88:b0:a7a:c083:8579 with SMTP id a640c23a62f3a-a8392a4b2e0mr298748566b.62.1723849929679; Fri, 16 Aug 2024 16:12:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723849929; cv=none; d=google.com; s=arc-20160816; b=W/9ONae0FRYgKa4U+TLBcUgnw1UHc6btPBBWm2V6gM6q00A77gzAL7m3TX6d4/F/EO wXNKumpV0D8yMgDl290v6OH58EFFLcOFg/mmG5iczZzJUlD1em4Rj9glwtMVnYns5tDI V36ORJ3RUb8HdCyTgpXUAmbq91N3TrO9BfFFvbp8KGP5RFhZSgRmdU9jq0u3BSCe9CrE Lyion6BLsQPl4uSUbh4FT7gYQxDbADM4ZRMzl81tTkd1eiq1JlOQZ/SDo4nuMsAQm/AT x8LXTliNRNzRZgs40Bk74ERVTIIStmjw7U1SvDsOKvHYa3Z51M2BnZ27U52ErFW4+gh/ wXHA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=1kR/IIjv6A8WmGL7p6+3qPo6Di3kebFMf8xfGVXokF4=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=s8RL2FAATJwb1+/CFSbGpfbG2xq+v/w/xAWdyTQOX5IUiTad93qyLObL1FUPwTpgi9 q1fEE9k/iOK8AuPiYTGWqzA4hUmoOpK3EzS9cA7tPPaSUF2zHwpA7JBfXKojpeAxMVyi N2dVLdXbwyKtywtLIu5bohYxwHlpF/gG1pAFxXpjLrS4WwQ8wyOgGPaKMu7yv7FIJHI3 5yULjG5ABqxxG6lDqJfPzEXaZIkJN2maNP4or02RFwnBClVoJoW3jVnKYaqBCaUR+H2O jzwzSI9Trc/jM+X9X0UhTTXA5tOvnNXiTlkBjv4pLbV80fQE8oCxphqni34tGrf5jPQ9 ZddQ==; 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=OTYdPq1z; 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-a838398d85esi248348966b.1049.2024.08.16.16.12.09; Fri, 16 Aug 2024 16:12:09 -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=OTYdPq1z; 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 93ACB68DC98; Sat, 17 Aug 2024 02:12:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 266B768DC2D for ; Sat, 17 Aug 2024 02:11:59 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 5791160004 for ; Fri, 16 Aug 2024 23:11:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1723849918; 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; bh=tqbA8ES4eNeNgq9k3IPSLv2Bk7NT4vT9RJedxeR/v+Q=; b=OTYdPq1zAjE6X6zcOHnHIXBPXFqJJIwC/SPUYK5PL/rDC37UTePxYyzuA0rRPZCAmBE6bS AjEV0427HpUdBk6btNcYOvmxmYRJyqLYwOlIPUAoGg85zUpOdB2qszghaljUNOSluKIXkF zEEBcgHxq6WW1eckzJgePpIyHm9+6G0h+PwGKhGLr94QF8I0VRnEsbWz0aPoNQ4T8PRCCI dw2vQEm4eV+lIEdtF9uaWy2JvdqUT8m9M5Z3U67VlZ4FHGUOgqGlBMNVW+ZV6zlNgpKvp+ tbM4lSNVNoQmJsZuavT2Lh0g6drlrGT+Hs9AvkHvV2l54Dz5lNUGe55LR9X2uQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 17 Aug 2024 01:11:49 +0200 Message-ID: <20240816231157.3166012-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/9] avformat/rmdec: check that bug if completely filled 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: KTSK6dwuh124 Fixes: use of uninitialized value Fixes: 70988/clusterfuzz-testcase-minimized-ffmpeg_dem_IVR_fuzzer-5298245077630976 Signed-off-by: Michael Niedermayer --- libavformat/rmdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 25a8681cfd3..4b21105d3dd 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -188,7 +188,8 @@ static int rm_read_audio_stream_info(AVFormatContext *s, AVIOContext *pb, st->codecpar->ch_layout.nb_channels = avio_rb16(pb); if (version == 5) { ast->deint_id = avio_rl32(pb); - avio_read(pb, buf, 4); + if (avio_read(pb, buf, 4) != 4) + return AVERROR_INVALIDDATA; buf[4] = 0; } else { AV_WL32(buf, 0);