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); From patchwork Fri Aug 16 23:11:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 51044 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b6ca:0:b0:48e:c0f8:d0de with SMTP id s10csp731650vqj; Fri, 16 Aug 2024 16:12:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXgHiwdMyvgTSpT08OSsIo8JXoWy2liWI+WAqp3e16WwJ7OxwcWCh+wDvWmogVyWCwv2Bds2nEam2E551YezEZpjrsyAHKtJUAlow== X-Google-Smtp-Source: AGHT+IHRyaxZWtYbiuf8oLXoV2fvNaZls69taqG0rWH/jtn/JRef2MYhwPE285YHPmo2T9VsG0JJ X-Received: by 2002:a2e:b887:0:b0:2ef:22a5:9472 with SMTP id 38308e7fff4ca-2f3be5de27cmr29948471fa.38.1723849939785; Fri, 16 Aug 2024 16:12:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723849939; cv=none; d=google.com; s=arc-20160816; b=0QCn4MzWrvfUojyiafcCPyXqhTmdxYyUBE18CQFXjpRxw4K6e2hsj+FUhGlayKc+1k mzKGFFyhoDSsszIJ16fc9q/oDZtaISFbywWIi/Sl2ML1hk0KDYmF0umLkWRdwwIG6g1Y DJt/6LoXYlsotrCerAOez0WMbE0sRjE+tsl/IUI3bvyBdO4MmPWUv+hbMWVQEaniKMiV hARtzENnhapqtX6v5gEPVInyn3YtOSJfAzQnMj1jCzoPB3at/vLLUGegT3GMGUHJki95 5WLInWrNqr9QVwcZBzyald3DVJzLfJyymMSLNdBEnrYhr7cpKoWDsxMMw7SLMfm07f4e LlAw== 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=o/d/eHTWGumAGGB4fQ2poo+ZlCYmiEjNTyxCHmqzWps=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=NNfwtPH3RXOpujpLI0D8mueiCz3QmbewBYsxKuoMMamr7aXQoFgNPUlt+f8ZTDkawV DdwcTeCud4FAc6tVkoKbDr9RcBwdjjRwBmNhbenm+Ws5kzIWbmTYqoPn9IC8ScyM8bXX F39ctt+jFu9070RDQ6mHJs4rGBS2kYWg9QDul3LOJ2g847WLWBN7Sd/ZOQQuDQKzI5Fv rb61Br2GRityZLbMrTyydLwSEBHskdPxg5netYXyBgVVQpzgpzMFe6eSjhI6K4zoxGdo pSItBJS9XpdKX41gfYvB8oWxKLKjU6zP8QTcANHYDelPq47uf2P5trabccqEV352xpoZ XETw==; 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=U4AZhLSO; 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 4fb4d7f45d1cf-5bebbdefa77si2571487a12.167.2024.08.16.16.12.19; Fri, 16 Aug 2024 16:12:19 -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=U4AZhLSO; 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 BB66C68DC97; Sat, 17 Aug 2024 02:12:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3FFB868DC98 for ; Sat, 17 Aug 2024 02:12:00 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 93E2220002 for ; Fri, 16 Aug 2024 23:11:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1723849919; 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=+5FJMq5eSAzsNBm2g4EonAR+Zb2JCQKc5sFtNsq1aw0=; b=U4AZhLSOhtGNo/3NNkku8wKQAUM/PyPvqoED6z42fANkWs2XkA0uUkq7h1bo/CLEGTiTr7 AFvHbofhgyb2r8e7tn2MFz/ERlg9zYFSG9+g8Lk3Zw6/l3+gf6xnViUOnnCrwHSFJJhkjC SKqH9/+stoiGzgwW37TjmXYDWjdznxLTwxMwqSEhBNnbXVZBKc9YcvNZ17w0btLhP3p648 R+wCUtB3U4wn7h4FTfZzjeypHoHkIr1tRVP6E67ZTsa9DYNXrNDBCY7ZXL2o+ESr5/V9Uc MjkW9BQYdjsv6FEj3lmMIN1AouUIMEQSl66x/bfsdQ6MBpQapXOrfzv3Ho7GqQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 17 Aug 2024 01:11:50 +0200 Message-ID: <20240816231157.3166012-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240816231157.3166012-1-michael@niedermayer.cc> References: <20240816231157.3166012-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/9] avcodec/avcodec: Warn about data returned from get_buffer*() 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: O2DqQYPMpa6d Signed-off-by: Michael Niedermayer --- doc/APIchanges | 4 ++++ libavcodec/avcodec.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/doc/APIchanges b/doc/APIchanges index 173f317ea1b..53d164959c0 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,10 @@ The last version increases of all libraries were on 2024-03-07 API changes, most recent first: +2024-08-xx - xxxxxxxxx - lavc 61.11.100- avcodec.h + Not really a change but get_buffer*() should not return + sensitive data + 2024-08-10 - xxxxxxxxx - lavu 59.34.100 - hwcontext_vulkan.h Add qf and nb_qf to AVVulkanDeviceContext. Deprecate queue_family_index, nb_graphics_queues, diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 2da63c87ea1..cc6dbfa59fe 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1175,6 +1175,10 @@ typedef struct AVCodecContext { * this callback and filled with the extra buffers if there are more * buffers than buf[] can hold. extended_buf will be freed in * av_frame_unref(). + * decoders will generally initialize the whole buffer before it is output + * but it can in rare error conditions happen that uninitialized data is passed + * through. The buffers returned by get_buffer* should thus not contain sensitive + * data. * * If AV_CODEC_CAP_DR1 is not set then get_buffer2() must call * avcodec_default_get_buffer2() instead of providing buffers allocated by From patchwork Fri Aug 16 23:11:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 51045 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b6ca:0:b0:48e:c0f8:d0de with SMTP id s10csp731708vqj; Fri, 16 Aug 2024 16:12:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXUmeu3b+tzMtlvX5AvHPyhbcM/ZL0gtZp96UZJyBeFkbcdHwdF5G+m6H1ePpMbn5GqLOvxEw97yTZJlCDXljzs@gmail.com X-Google-Smtp-Source: AGHT+IEU7lErxB5u8BlRwqK+v+RuMcaqZ8v081x1ETT8/Ym7KlIKRWeC1pRKDzlsZwZX5Lv/0I17 X-Received: by 2002:a05:651c:1417:b0:2ec:5fe1:c762 with SMTP id 38308e7fff4ca-2f3be60b9bdmr24554661fa.46.1723849948693; Fri, 16 Aug 2024 16:12:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723849948; cv=none; d=google.com; s=arc-20160816; b=Y+Y3vmhplarKPKFmFDL89tN1agcUNKnCwFPNIYn1o0cVB+ALJpkii1ThiqWUEIAwMm vPw//EFi9eL8tEAINsVLDGtVHpZbHnABvdyyRqqaBeVJEXMxxdFBw2XGIMQ9gJqrlUcn wW/vaJI7vbVVZ/XvNOTt5ewtMzRJ9sz//Imuea9yzB2HMxP+GwxrSbUm0lsYUzK8wpOB WDWQoggYbXz+A31T6fxTLStoW6X5D/gMgxI1laZdYYIvgCoOs0+Mt2EfEqK/YvoqeE6w +nAzQNyBTZyLCYAcT8lK3J0F08LgiRLzUisS1LB9Ktau4nrEb9SIhAr2G1DfMGs/KOCP n7UA== 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=s+vYlGi01viTdGRu6PoZo3JDHue+mMB1ygTo/b0a0dI=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Mu7sa/bpKQi7MDogGQy7ElNF62j0sFhBo6v2SnEqFYfB0KMHHS3E91OjOLV7im4ung jrHZCzDKNWKm2p0x1Cbk7Yfu6YisDB7c/kpq9+/Bz/rDMo+HGIbsqVwBoUDSGAQEUzgW jT3KdYdACY+PPj4+SeBDHNx5OdtHpIpoNohSSFRljhzcJVrLJvPrI3Z0qdjCJFt0kPa7 XDqlhcZnAYnUTKbCo2bSBiwCKE3kl7W1pUIMHZ6sMz58yQySV8DnE6rU1t2HooiOoUXT VHvveE8juePKI0Wpv1U2YD33v6VYFHWs1HD3ZKcTpWXmP0i6ZKc2I2hbouejK+AE+tnH cR2g==; 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=obEGmnsT; 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 4fb4d7f45d1cf-5bebbbee266si2587671a12.87.2024.08.16.16.12.28; Fri, 16 Aug 2024 16:12:28 -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=obEGmnsT; 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 E539868DC9C; Sat, 17 Aug 2024 02:12:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68F2268DC97 for ; Sat, 17 Aug 2024 02:12:01 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 9C6EEE0002 for ; Fri, 16 Aug 2024 23:12:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1723849920; 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=NS3DjUc96qAT25/H7v8oPKhWlIBfUFgEOR9zfSLEe4o=; b=obEGmnsTQxri22BQ26QCuFq4Ben/38ngc0RV+PkQKyzo38Ou/GFKGv89vrehD2/HwSXXrI MRrzwIm9D4mWcoDBcz+AUhxubydPTPDfxDLM1hRZ1YDDAKoHQ0s/WRszp6Rn4H/mesBBB9 Wei/hXqABqDCc3BQ47G1lJTpnlLQXmg/9kPwITMea6vqDn3a3D656dr/GNDvERflq69G8V TLdwF0qWo7wHH9rPn9UAzMhsSxsaDQj7mqCeM3QwIcbXw7CfwHX7hiEa20SjBP/FxFQmXZ sdvD8TtTrkwuscGQLnwfb7xuCd4Gb9Q+di/jzl+To3B+GgzUTA/3GdP2BUrjyQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 17 Aug 2024 01:11:51 +0200 Message-ID: <20240816231157.3166012-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240816231157.3166012-1-michael@niedermayer.cc> References: <20240816231157.3166012-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/9] avcodec/webp: Check ref_x/y 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: k2EZVxkvbrwa Fixes: 70991/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WEBP_fuzzer-5544067620995072 Fixes: use of uninintailized value Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/webp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/webp.c b/libavcodec/webp.c index 7c2a5f0111f..b624458d675 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -704,6 +704,9 @@ static int decode_entropy_coded_image(WebPContext *s, enum ImageRole role, ref_x = FFMAX(0, ref_x); ref_y = FFMAX(0, ref_y); + if (ref_y == y && ref_x >= x) + return AVERROR_INVALIDDATA; + /* copy pixels * source and dest regions can overlap and wrap lines, so just * copy per-pixel */ From patchwork Fri Aug 16 23:11:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 51046 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b6ca:0:b0:48e:c0f8:d0de with SMTP id s10csp731768vqj; Fri, 16 Aug 2024 16:12:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVk18PlKOS1jlckdr7NOd+8L8SockDJBi4iTLgwpCfqkgXORbxoMCRJFSHT7jL+Kw7lgtZ0MwQ2y8FvI9/rzGN4nY0KUlAKSjEF1g== X-Google-Smtp-Source: AGHT+IElzBh/d8OVeoEvCoo11TV4A+fBMsjPKdMmgrOEP9PF0M3ACGF/p6jVM1nC8rd3cH4AHXN0 X-Received: by 2002:a05:6512:3b21:b0:52e:99fd:d386 with SMTP id 2adb3069b0e04-5331c6e51femr2976933e87.50.1723849958664; Fri, 16 Aug 2024 16:12:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723849958; cv=none; d=google.com; s=arc-20160816; b=BNlcnZnOHGMb0Kj4C32bgmZz38ulCh3cTfmjld9nzHrHkwlubsYRFOYmsBs1bnSF1y yRQr0efmWfTDm7Ee8oHX+CY0UeCkcMGVm+ukcXOzRQNPYNZO4gIMEn/mvPGJcak332t3 YjHggGrywe1MkOOfpYSFWNpxQOpDx3TdOQwEk56dDVLP58q8DAExms8WIRlW7AD7Ydrf 7jnjH7b1Mvlx+q0HcScPKbyLdlzB5TAEdbbbpM0wP9/LW011fCC+dBL3UCTzQx9pmj+6 Prv00GN5X9OxtgqF8B60jrBfNKO31sigxczx8obJwCDSnGv2n3Pcw2fhM5Ho5leASfBw qHww== 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=mp9CWo+WYzVqECuHPmY2ie9Y48W/cubFEfVqOo2O/CM=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=xhuJOs2QLDG9hsMpvFT/QMVK3HegwmqFdxRbE/oWfMAdHrLAefXJ24QbqS+AEpjd7e P+vG5n4gwPTedpz/k9hNerJLwmO+/pB0Nb1lxCzB1qpuQH7+eIUwVG4fVcQS8cXPSwLg 1C2+nayztZtEMKTpBeRbibP5IS/ScAxbgNGPiDZtv7j2wtivycRG0GqiFE5+6fKspmyP QjY1plkPJIaDRDFD5Fhlk9kHDTMu4a7/NKr/eSeH3TnTIo9NVPW/jdPybLShm+Li0fpp XZM6aZH/mHRSfbPNypKQUeLbxjwlhMUCTS1os6xBGdvTxLPc3Vsyv8kG3JwQzgikk26d 0uBQ==; 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=gAm7rJBN; 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 2adb3069b0e04-5330d41cf78si1252978e87.391.2024.08.16.16.12.38; Fri, 16 Aug 2024 16:12:38 -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=gAm7rJBN; 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 0CF1D68DCAD; Sat, 17 Aug 2024 02:12:10 +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 AABDD68DC9F for ; Sat, 17 Aug 2024 02:12:02 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id DC44F240002 for ; Fri, 16 Aug 2024 23:12:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1723849922; 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=3fUzCGXU0NmCH7mRy0WYV38QWfTqSzcaaGosBVyejlw=; b=gAm7rJBNBEb/AcemJyx2orpHITQSsoB4J06VJkTjnFUh64HTM9K98Vft0pBl4iofRXzo6e Llsvp2IwwkOMO3vAgNV5NS1+8sSbZ2Ow0UdlR0++x8DGvU6xPLgcXKYnp+OyVFIhjU8UKl MKOsUc03Cf5hnY2poMvV8onKEPdIgcOZLveT8BOgAtprVpQ4uZhDa4CG0DUpytikooxkFy 6nymEF3wRR+BNRnnJyVlz3cOjB7ONdC9hJubOapfK9/SKjkQ70cFr8b3cC7TvhI7OO+IWV PO+mBb//IOXltsQ1y1spXOyzGoUfB52PY7NHWeRP61QqAQOvHVuOp1Wu5ey7yA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 17 Aug 2024 01:11:52 +0200 Message-ID: <20240816231157.3166012-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240816231157.3166012-1-michael@niedermayer.cc> References: <20240816231157.3166012-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 4/9] avformat/jpegxl_anim_dec: clear buffer padding 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: JXutpqye6iuH Fixes: use of uninitialized value Fixes: 70992/clusterfuzz-testcase-minimized-ffmpeg_dem_IMAGE2_fuzzer-5735819170611200 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/jpegxl_anim_dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/jpegxl_anim_dec.c b/libavformat/jpegxl_anim_dec.c index 2338a2e8c07..7798f3dabc2 100644 --- a/libavformat/jpegxl_anim_dec.c +++ b/libavformat/jpegxl_anim_dec.c @@ -43,7 +43,7 @@ typedef struct JXLAnimDemuxContext { static int jpegxl_anim_probe(const AVProbeData *p) { - uint8_t buffer[4096 + AV_INPUT_BUFFER_PADDING_SIZE]; + uint8_t buffer[4096 + AV_INPUT_BUFFER_PADDING_SIZE] = {0}; int copied = 0, ret; FFJXLMetadata meta = { 0 };