From patchwork Sun Jun 23 23:01:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50102 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1692909vqz; Sun, 23 Jun 2024 16:01:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUi/Zuqu8QATEQBTwIDqq+yz43Xk6vxhsENdGEquqXgERUZ3sJKltJB8zXSiXGZUE30uMoTJrmppJNAYBOVRl4WfDILv0pdhNohbw== X-Google-Smtp-Source: AGHT+IGMBcqR1RWcFfNybAd9JpHbotuv7QrJhOQAReJpsx5+U22tRNEdD16PNb1+9bXGndo84riZ X-Received: by 2002:a19:2d0a:0:b0:52c:dcd4:8955 with SMTP id 2adb3069b0e04-52ce183ade1mr1635624e87.34.1719183711414; Sun, 23 Jun 2024 16:01:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719183711; cv=none; d=google.com; s=arc-20160816; b=I74jFTGrUqTPy3h1CsWx8fCXK5kXl5d1lppXBJa/VHiglTUeHCqsugs/j3DOe3OMIh tS4NZg1AWpNCVQLGXFW42dPZ60uB7A55h+r2tmvVYpZUtnyTYV8TFf3xrWr++Snkac5W DTkrisak0JHyHG7A+XBSfZsNM68OQ5Tl1jj5j/RW1eDFFqhxYuqquQSrswsZK0pQUH2y udrGZ4kipmPf6GOiVGwSyA1O8cJPJ1vHg7FK2Gz2UmZL6lImOWsErtOwGKBMHyfuPIG/ liD68AFH7uH8Zvl5bqJFtZ+Fe/6QZuCSU0decANbFXir2z6jA7bn9LepjCaPEbR2wgE0 4syg== 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=OYm3USjYMLbx7yiBaSX3N1UYCyJWNG0hgVO2vzMxSCY=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=KG8LblHx4uL6oh0AdIftl+tkrS9rhCkGuqxXjlGClprUDfrkcZdR5Fnnl28rDimchs lFAPzQe2Lm2mqBfLDmWPP8VsBJLEKP7i48RpyPpj41rPgJTH+SRSXPG/ZSauM6jhFvBo z1h0jJNwCB2dePuvdOFQ0esiVr8B0zlBFDhKocuK25248eiebMKjyj1LZVBN/rIe3JBL xWRItuPxrHdrltFTtJ6WmA5w7UybjJ7mANSUbWc3mish+j9rBxZ49BmjHs0CnO5i40Xx xzu+8oTMmDRCqApIafJ9g6fefdaWGjjeHoRffO81Hk+1fdtdGNsyOxhJ/hSeFrgC9BXG 7BqA==; 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=CcqAO39J; 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-52cd64525dfsi1739684e87.561.2024.06.23.16.01.51; Sun, 23 Jun 2024 16:01:51 -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=CcqAO39J; 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 A6ACD68D40C; Mon, 24 Jun 2024 02:01:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9798268CF50 for ; Mon, 24 Jun 2024 02:01:39 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id C2D50C0002 for ; Sun, 23 Jun 2024 23:01:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719183698; 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=jAtDwzaJB5ndsVYwU7Z9kuM29qHjNQDhYhzOTlTBMJw=; b=CcqAO39J/aZ4lLTvVcTkVLj4AWraxrl6NereZGA6Y6oVbP9mlPn4Ro7yoVsb4EK7tVw9CZ dNDTa1R+MTHP/STJzyJhqjac34HRfQYG+ybkVQIWiOpLSw8IcOpz47xbhQ1fO2rlRUSx5b RMbgAjt+VvWx+7s5jB182l+QUy4MoARNKZ2KqtPdXf00YptPdXBu0Eop0COTuhZkPEeyPI 4U01LUcoO1uoxHPiuKbclHHqhC7B60A7Z4vIr06hyQtaE5WJPTJihwgqo+5ig5rkSLIoB9 IwNsoyA1UcHZBCUuKG+RShkBdyVsZmb7MVP5X0sZY8Ao6Rpm8gkSklg4Ri/a9g== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 24 Jun 2024 01:01:33 +0200 Message-ID: <20240623230137.1749178-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/aac/aacdec_usac: Test ac in usac 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: cXnQEjMCFuRg ff_aac_usac_config_decode() needs AACDecContext to be set but some callers pass NULL. I have no real testcase to implement/test this, so failing in this case seems safest. Fixes: member access within null pointer of type 'AACDecContext' (aka 'struct AACDecContext') Fixes: 69435/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_LATM_fuzzer-5733527483121664 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/aac/aacdec_usac.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c index 132ffee9c20..4856c1786b7 100644 --- a/libavcodec/aac/aacdec_usac.c +++ b/libavcodec/aac/aacdec_usac.c @@ -348,6 +348,9 @@ int ff_aac_usac_config_decode(AACDecContext *ac, AVCodecContext *avctx, int map_pos_set = 0; uint8_t layout_map[MAX_ELEM_ID*4][3] = { 0 }; + if (!ac) + return AVERROR_PATCHWELCOME; + memset(usac, 0, sizeof(*usac)); freq_idx = get_bits(gb, 5); /* usacSamplingFrequencyIndex */ From patchwork Sun Jun 23 23:01:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50103 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1693058vqz; Sun, 23 Jun 2024 16:02:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUWHxKqVokfSYQfo8BgSYiH5fQLjfz0QzXJCfH0l1zvcSqlMeXzNvK9q0PlGCkcEZuAJsKJuxc0yzaOQv+MaeH2RWgO4piXCmXKiA== X-Google-Smtp-Source: AGHT+IEr/xdf6jPBdaSYw7we/aLy0C//Hhi3mmUHj5+yJaNe8QNoL02v68N7pBhhxWCZETh1yWfe X-Received: by 2002:a17:906:99cd:b0:a72:518f:3baf with SMTP id a640c23a62f3a-a72518f3cc3mr114673766b.6.1719183720337; Sun, 23 Jun 2024 16:02:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719183720; cv=none; d=google.com; s=arc-20160816; b=dYfMDRgGAIIdVFRnql5DDnr6nfIPZ7DMjdxfKsl0t1oFZp/jlcY/+F+jZmDfUTO37B X/R86HH4YE14j5u40oUw1vjvAre0uvChZQMAJ91RZxazLiwvMztEdd1zv/WM5RerFfm9 gHLc5JkvPIfz5k9QKHViDL7+wGZP9U+AASbQ6M9fcoAurJOVm3e4SnqStEx0dWURZPhA 9ZFA+BLpuBAmy0a8yAJiRreZ0rJWPKo799ppoljmsGQikatYNHG9DY/H0GAZvc9X+fWe 5aVYktHlkEHSem/yYXCureLgbB56Qkl/9vaIdQtrim80gHjBOfOk+QcHmZ9We7IkykVq /SYA== 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=YQLyeAWak7i6sVXFNR6D399k6njyyUqgtbk4cu+sekI=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=jYtrKA6DK+lJYdKwpSaAotyYyQtOk92qXONLdeSvOcl5lMfF0V5KX+3DmHA9jxJkcR v9YFeFmX4mEw8/Lq4cIDRzy8+Ml4mLJsfCYuPjPR0TIM/9jDV/JGBR6vtqt+AKZgNy5O Dc32vn0cJa3wVU5tbSRXEna6CKv+YXgPW4fwrE6U0GTSCO579MqdsBl2di4qM47NawIb RE08l61FdexbVVlLUR87J9Yz/XND4iRGIR35iYbkewDnaslP2+3Q3jnpnKPyRyMKPoCl PYtPRhd9y4ud6h3R5iZPrKYLek4beWVV63hlHb8ziDQRSz73tOxzQqA1qVDsuKnYgxk3 AyAg==; 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=pHnH2G0Q; 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-a6fcf460f11si321711466b.211.2024.06.23.16.01.59; Sun, 23 Jun 2024 16:02:00 -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=pHnH2G0Q; 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 E51C768D61B; Mon, 24 Jun 2024 02:01:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 00E9D68D42E for ; Mon, 24 Jun 2024 02:01:40 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 3A7451BF204 for ; Sun, 23 Jun 2024 23:01:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719183700; 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=qk20pUiVkb5Oo1DovfyhpqnOtcfrCMaRHvN3YGnVH7s=; b=pHnH2G0QfSdR7hTKSBEx2SUIaaNBBBr6AlDazuDcS8Xk8A+pL6TIN3oby+ipC+jHYEXjIm tjRw/06loyYom6CmOrrZzkxFyve50pNoXZ/SaqlaQDqRPVNhlO3VNoMWJz55I/N3NLBwMs LTbdaNTS3uIYLNMKSQRD6PT4WZsx/XqX8nmT+1GhHP+2FF50uB0rOExx6ohWUbcP+yfnYd gaAKsI+80TH8BT4aXoVj6Nn42PLzpofBmp5gCiS1HGAWQTeexCdWpnNnZRbH40c3wqQNei A3e41KGwmMwHR01indokEecqWfqWPEWUGiSTstH/EqZFFDYxG7QzrFpsEBm0+Q== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 24 Jun 2024 01:01:34 +0200 Message-ID: <20240623230137.1749178-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240623230137.1749178-1-michael@niedermayer.cc> References: <20240623230137.1749178-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/hevc/hevcdec: Do not allow changes to parameter sets between slices 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: jPw7mA7Oi+ZO The slice code detects changes by comparing the pps index. That way the code cannot detect changes if the sets can change. Fixes: out of array access Fixes: 69585/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-6389604524556288 Fixes: 69601/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5069068613255168 Fixes: 69621/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-6187334182174720 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevc/hevcdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index 1d2e53afc32..d68d454537a 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -3221,17 +3221,20 @@ static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal) ret = ff_hevc_decode_nal_vps(&gb, s->avctx, &s->ps); if (ret < 0) goto fail; + s->sh.pps_id = -1; break; case HEVC_NAL_SPS: ret = ff_hevc_decode_nal_sps(&gb, s->avctx, &s->ps, s->apply_defdispwin); if (ret < 0) goto fail; + s->sh.pps_id = -1; break; case HEVC_NAL_PPS: ret = ff_hevc_decode_nal_pps(&gb, s->avctx, &s->ps); if (ret < 0) goto fail; + s->sh.pps_id = -1; break; case HEVC_NAL_SEI_PREFIX: case HEVC_NAL_SEI_SUFFIX: From patchwork Sun Jun 23 23:01:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50106 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1696496vqz; Sun, 23 Jun 2024 16:12:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVcBzWfJz3E+TvviDyIymyPev1yzWuTkzO1hsjKCcKrc6FrgY7hsSWjTpUOXycu3NxgJWHqw5pp6taOn3VOzCj7NEXoQ2NfG0BVrA== X-Google-Smtp-Source: AGHT+IEd1XJmY9K3935tk0cDyxkTDErhsk6XJun2c5X1XFS5pnW0xWJTOXmFsquNZlHlP5EyTJoX X-Received: by 2002:a17:906:2596:b0:a6f:d107:7309 with SMTP id a640c23a62f3a-a700e7316b8mr290761766b.37.1719184365949; Sun, 23 Jun 2024 16:12:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719184365; cv=none; d=google.com; s=arc-20160816; b=f5U10+aSxZZditkikiG6z4EUq1CA9AjMsbDslYEf0esvysIL4BzhlrVLqVuHx6z5A4 jCBcOpeAABy1Ln7gJRbFDeEgSv/bbxt//P0w0LMgdkSY2QUkTha+/UBHo2aX6VfyRu9z stvaQPTI/S/uxozjf6HpzxbeECFvOr74+SfRNQhB3ccFpiiNiBeCQchthu+ZIVsCXu5P DuKmzhG82I/f1x9pMoIr4d0sMS01/gbI7PbMJexVXLeRDz4jHlpm3B8CjAEU4fBv/IUm Kduws/dQl/udj0MWda4767w6WmNQRtJl4sdVTAiE/KTjWpbOynw9CIhR2zEV3HCNtmjd UdtQ== 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=ouRzqw8ODKfB9ZyiuhHX5aP5Tnm6IMBVI420Bju2Axk=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=yO2oRwJ/4WKmykQ6Cs5MiGmHbbSpWK1tBpFIupvlk+8NX8J9eIBYXgsugGHIj6RrkH +U56nOke3rEJ06cviND44B9SM+TkxUUp+jHXVp49N5JZ0fmO9Yov0SHPHs6KOevC7vs+ +MfyiyUC7IGdr5xIoSdVC1IvYwFcP+fqgLgZGy/VTDMzFh5yopOhsYPdkyQ6NtVsjewI QlOmVsXJFOBJYK2Vll0nYqsw4vWJGoVjVEPR/QkcE+jHMvHkzYB5YZRJN8W/8X5Ph2eU eU6axJQVmfIuckE7zoBaX7elztfRoujwHqnMSfGkHrlULuVVYQz0DK7QVWjcT3poGiie QUEw==; 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=SwfeLiTE; 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-57d306b60f1si3030804a12.285.2024.06.23.16.12.45; Sun, 23 Jun 2024 16:12:45 -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=SwfeLiTE; 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 22DB368D63B; Mon, 24 Jun 2024 02:01:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A306368CF50 for ; Mon, 24 Jun 2024 02:01:41 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 095C3C0004 for ; Sun, 23 Jun 2024 23:01:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719183701; 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=dswMyev+Mz45bCxwL5GP9aGoSDpp0kCMVy2fVpNeBgg=; b=SwfeLiTEXJpP4vO4eZhA32SfxJUNgAp2W58Wc4aIF3rupB2op0BACL+OJg4IdnvS5uMRVg 5+0Y/jVpu/bAJEQr+oosYHDFoDHgyWpC6HqFEdDIQubB/e378gOa+5iZbGyp7WuXqTS37O h7ftS2I7oz49f19Of0d0rUJ65z9TQom3rYs1Vu5hSKx31cZKW+e48b/ndSZ4gK7eKd4zBE zSbqe0qSl/Tn1vyjUW/D1nucPe6baRuw4BTjF+d7dHm2Q8nJXpsMVOtMFrSlizV/w22X6g 3JgUmxCn18GM5oxqsdQT014PNtkNst+/c3bbb2Q1v4oXQd4M53YStQsCqysE7w== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 24 Jun 2024 01:01:35 +0200 Message-ID: <20240623230137.1749178-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240623230137.1749178-1-michael@niedermayer.cc> References: <20240623230137.1749178-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/hevc/hevcdec: SPS not set (or cleared) after frame start 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: bF0QnplH4oFH Fixes: NULL pointer dereference Fixes: 69623/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-6549698459009024 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevc/hevcdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index d68d454537a..4dd84d4953c 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -3180,6 +3180,9 @@ static int decode_slice(HEVCContext *s, const H2645NAL *nal, GetBitContext *gb) } else if (!s->cur_frame) { av_log(s->avctx, AV_LOG_ERROR, "First slice in a frame missing.\n"); return AVERROR_INVALIDDATA; + } else if (!s->ps.sps) { + av_log(s->avctx, AV_LOG_ERROR, "sps not set in slice.\n"); + return AVERROR_INVALIDDATA; } if (s->nal_unit_type != s->first_nal_type) { From patchwork Sun Jun 23 23:01:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50104 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1693108vqz; Sun, 23 Jun 2024 16:02:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV1RhdT5H2ONKWk0csFWFHfkEzSb942C16bHi9o0wiEAZ8bNW8Buwz2SJBfY76i2uEKOPtCnD8wi0iOsKeeiuT7gMNthkpNAlESyQ== X-Google-Smtp-Source: AGHT+IHc/vyBBgXkeLI84WiGkr7zftiLSY4FJdTkldpTsd6B6ZdShYkKoSyn3zdl62pSEi1LlVFQ X-Received: by 2002:ac2:491d:0:b0:52c:e1c7:fcd7 with SMTP id 2adb3069b0e04-52ce1c7fd80mr1529636e87.32.1719183738107; Sun, 23 Jun 2024 16:02:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719183738; cv=none; d=google.com; s=arc-20160816; b=jyVTziaQNU0bLMf6rpX18izK+NDD3+g7T1+F/LztZ1vvfx6szTg3qgGH5pruJtaY8i bLmTDav2bZH+3uQDOfds04oPx2XwfqGR42c4vajk+XD7m7XW6NyB03QKAZee9tFH3n9T 6BHTTOGLrgi+RXmgGKYuUCDiKMgdY5RE0aqhi8wzkm/HXDhC4gvurbVJCpDIfOuwueOw +MiqwSqBokgNkKEPCjZaohTasZEDszwPJp54vs6xy8WdH0FOvDR7kIR4kO41IGEbKsR7 7DKtwLFSJqenylLuq3f9pJ3ym249Qt2GsbgWJBxMjkY/gQH70v7YH4vb9PdV39qWulUt 3oXg== 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=LIENG74ecncHgWVJr73xNtBILX/RBaQFhp/RHEAK3MU=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=KNQPK7o7gmb8tw2EoQtLxB3JYgF5hlZSdiJUd3CUU3ZiLajW7udD6pOh8ogBj0uHHJ Oiitv5XXusDivPwBGMlCoETLTtBY6wouxxSDFPuxEY8qX4YLq7dH0tVSv7IYVl+xKKQI MjaQJd5i5rJK32sWAej2SgosjKeTX65ZB2/Dfg24I3jyRsjL2mg0o7wb6Fdfs0x1+mVh GAUZ8J8N3sK7tvLgnMtCjHHXpkVBS1km49QcDRgM73StcpWpysBkdsATEMBWuAES6APR F/9pjDuQB8HsUCTjNDKvsPo/zYSp+PWKxC18+HEeoeIs02Am5woUlkAM3KmvsBPyQXPu MKUQ==; 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=ja5zG+I2; 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-52cd6440f4fsi1789724e87.488.2024.06.23.16.02.17; Sun, 23 Jun 2024 16:02:18 -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=ja5zG+I2; 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 5F6D068D650; Mon, 24 Jun 2024 02:01:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9448668D61B for ; Mon, 24 Jun 2024 02:01:42 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id E5B5E1C0004 for ; Sun, 23 Jun 2024 23:01:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719183702; 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=6kqBzpev1I4VBNHf4Ct7/juZv8n9zHGCYhNomJpBl+U=; b=ja5zG+I2BIKbJCMBD6n+712LmE+BJefkAIXo/qHunJuP6UheBDUbhJfmJy2xG9qVNGC8sB HGObiKcFjtrtknNGZbaL/R5xOTzNcWXPjKUaQC/kfgSIeNIDJlFVyFnWWVAxzXYQLBWwIf a4Tk9NwvbDHcxivrt9tidBnLaY8X4TN4DNc+NyaeUGErzCR/DxEEb5u1nKcIWN0rs2eR3/ cygGTGjmTsoh1O1sLzm2rVQlXkdqosx8KwFU9w004JKVGGoIZrCff6l41ZT4Jc5gI4K20d O/WgdytpDS4rb4LZxfybgCyBrwx0B+k8YLfO8I0jfo+gKb/blu+gDQvl42+GFg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 24 Jun 2024 01:01:36 +0200 Message-ID: <20240623230137.1749178-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240623230137.1749178-1-michael@niedermayer.cc> References: <20240623230137.1749178-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/hevc/hevcdec: Do not allow slices to depend on failed slices 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: 1JJ2H2dZd51g An alternative would be to leave the context unchanged on failure of hls_slice_header() Fixes: out of array access Fixes: NULL pointer dereference Fixes: 69584/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5931086299856896 Fixes: 69724/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5104066422702080 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevc/hevcdec.c | 5 +++++ libavcodec/hevc/hevcdec.h | 1 + 2 files changed, 6 insertions(+) diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index 4dd84d4953c..0e0a910641f 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -626,6 +626,10 @@ static int hls_slice_header(SliceHeader *sh, const HEVCContext *s, GetBitContext if (pps->dependent_slice_segments_enabled_flag) sh->dependent_slice_segment_flag = get_bits1(gb); + if (sh->dependent_slice_segment_flag && sh->slice_failure) { + av_log(s->avctx, AV_LOG_ERROR, "dependent slice failed\n"); + return AVERROR_INVALIDDATA; + } slice_address_length = av_ceil_log2(sps->ctb_width * sps->ctb_height); @@ -3157,6 +3161,7 @@ static int decode_slice(HEVCContext *s, const H2645NAL *nal, GetBitContext *gb) int ret; ret = hls_slice_header(&s->sh, s, gb); + s->sh.slice_failure = ret; if (ret < 0) return ret; diff --git a/libavcodec/hevc/hevcdec.h b/libavcodec/hevc/hevcdec.h index da4d83e6615..91f20ea26ab 100644 --- a/libavcodec/hevc/hevcdec.h +++ b/libavcodec/hevc/hevcdec.h @@ -213,6 +213,7 @@ typedef struct SliceHeader { uint8_t first_slice_in_pic_flag; uint8_t dependent_slice_segment_flag; + uint8_t slice_failure; uint8_t pic_output_flag; uint8_t colour_plane_id; From patchwork Sun Jun 23 23:01:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50105 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1693164vqz; Sun, 23 Jun 2024 16:02:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWRNkYSYBdrrG59d7B+6/XkQSRYg+W1Sm7H+Xz8ClM3/zam/m1JkI4S1b++ShzZiAMC6LskOukQX6uz9PfSMdbP9o14LqfHdcWwBg== X-Google-Smtp-Source: AGHT+IGj7iskgxqEKHJTTWbnBK1aFKgmzQwdMDUYQyo0dy/R18eG0e2frcKgEhbLvfiGJrJbBpg2 X-Received: by 2002:a05:6512:48d2:b0:52c:dd2c:b8be with SMTP id 2adb3069b0e04-52ce0619953mr2414388e87.19.1719183746451; Sun, 23 Jun 2024 16:02:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719183746; cv=none; d=google.com; s=arc-20160816; b=CNVSLYyVGv66LVIDlrDo//YdUcVW6in1gLl9m6cVSxAW1vo+hAdc3XBFCS30CI9A4x j0VxiX/FuVdhjMQ0R5Krxvf6t0FT8ESpggg71Sq//c6vkS21+IYq6IV0bm/g1gMQYq8M Djh602dr7hb7Hjr/bYUM6s36kAThmEBVH0gJyB936X8hRABMANeRlSr/NVItnslPmMzN A+X1S+mzmlF1oCs5Xit5TlKqqS8KZLZR3qEPBxDnl/VYphyH6IdZ8pZeOwkAEcNNZfYS NSMGm9HZvLwg3Um3aDuQ19xp+RBRt4Yg5IfqP5dsahvAFUpp7x2pZnMeul9vntLbT+P6 iuTQ== 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=blx3jZ22bwsqAxW9/UmS11vJbLnOJwiAFImaWVkQhig=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=WNr5C0SjtV27DxIIiPrccxwwnxpGAZUaMYf7J60tR9gzatl1w02m/eH6o0QDdEGuoN rAIZTnEVGejPCiicRcRXN/lNQh06NShsj867zEl9lK43RRqZFGOmQnGGG5gMcBGE8oC+ Ziq1AP5WXaQUJbMNeWbHjB3iDaf0OiXuT0MpA4Q0c1HYrehceKSiXPwTq+RBBh0X6SqH pvWdB7oWXgr05bxspcCG2Er0fGD1wI3FjWkG8PK2pAUieI2E4UAVcgXqP1t9CeTUt24X CRJ/KqkjYaO1shy5o+tSdw+52uB9cM85VwEgGe3Kb2o2VUB0AAQjrfPje2mQKQhSMIBa p+qg==; 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=pqhHEun6; 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-52cd63bc04csi1783827e87.133.2024.06.23.16.02.26; Sun, 23 Jun 2024 16:02:26 -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=pqhHEun6; 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 B82C068D62E; Mon, 24 Jun 2024 02:01:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 54AA868CF50 for ; Mon, 24 Jun 2024 02:01:43 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id AEDC81BF205 for ; Sun, 23 Jun 2024 23:01:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719183702; 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=lOgBhVLruIlJ6x6FOPCSf/ljRUOba1vvYuSlniB1mGs=; b=pqhHEun6rj3bCq+OR1OzXddtLAirjvJb7UdYMQb8sgeR10g7EoOy5AzVZtMKCWSUNbs5LF VL7wAXYNs0l8D072wqLN8oI4XktSoTIVIZyHn+dRPAaCVLJBbJ236DXwFA7H3A4w/R4svq rkeZpb3fZpgYgfPTx8F6J2LzeiAXtit7WjqbGA2vsoJP8Hf+A64P+dCugWzE37MhOKvADT rjiOBDT9KcYuwTLzFxqWedSzFcYKmQD7eG2YsgyELH5105Ee01W7yVuLus+kT+EXrnG07T W/YrB6lVCO+AMnqmUfHGkeCtQe+opFOgnupF130JWSYToytsfSrP9/tABJjxew== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 24 Jun 2024 01:01:37 +0200 Message-ID: <20240623230137.1749178-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240623230137.1749178-1-michael@niedermayer.cc> References: <20240623230137.1749178-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 5/5] avformat/iamf: Check substreams in ff_iamf_free_audio_element() 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: RJ6akbR8X09U Fixes: member access within null pointer of type 'IAMFSubStream' (aka 'struct IAMFSubStream') Fixes: 69795/clusterfuzz-testcase-minimized-ffmpeg_dem_IAMF_fuzzer-6216287009701888 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/iamf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/iamf.c b/libavformat/iamf.c index 5de70dc0828..364cb60e021 100644 --- a/libavformat/iamf.c +++ b/libavformat/iamf.c @@ -74,8 +74,10 @@ void ff_iamf_free_audio_element(IAMFAudioElement **paudio_element) if (!audio_element) return; - for (int i = 0; i < audio_element->nb_substreams; i++) - avcodec_parameters_free(&audio_element->substreams[i].codecpar); + if (audio_element->substreams) + for (int i = 0; i < audio_element->nb_substreams; i++) { + avcodec_parameters_free(&audio_element->substreams[i].codecpar); + } av_free(audio_element->substreams); av_free(audio_element->layers); av_iamf_audio_element_free(&audio_element->element);