From patchwork Mon Apr 1 02:00:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 47691 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp486023pzb; Sun, 31 Mar 2024 19:00:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVhtdSAlIRzTE2gTYJTVYFbjP1rHEgsTNH8w74+ztICvAOUY2FMoBS9EdpjfDiztwRx3HRpj5ubhG2hA5d2f46QB3kn2jLQLO/SQA== X-Google-Smtp-Source: AGHT+IHFgFoDPxGhSLaXqWcyFuXBsyZHGeJeBQ0CHnLzDTtMXpYmcHe6t84zTI2zYc8eM9oRKXYh X-Received: by 2002:a50:ed01:0:b0:56c:5a49:731 with SMTP id j1-20020a50ed01000000b0056c5a490731mr5148418eds.1.1711936837680; Sun, 31 Mar 2024 19:00:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711936837; cv=none; d=google.com; s=arc-20160816; b=C22FcDjl+S1rKtFosmA6005feUnJhMAcQMG5VvrakbwmPBi6s/Qyh74y9bCZ/H+h8q kCCInV+jCVwRd0CRFuk5gmH/QFqauhe5K1HqqA5JHbxfWofrAvCF3nVbnrUkp32MWU9z 3ymuL0zU+nZkyDfSbSj9Tp/whGvZfkape4VTzlOk6FoRazgzkEjkZWhizd9Ax7uMmR0r k3ykyBUMJX/cgW6ZkRDU6wVhjHPj+N84QMAkuZopvoRvdHCkf4jhx04bsv6AWQqXwWHk uWYKMbmU9lvEWjU1Pwpeb5jGhUFKN4W9AiOGFshHdIYF0HpU1qDJV/WOV942QeYawZKP gjCQ== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=oXEKWURzKFhS+Kc7PP83jkTLwdnA16bnpCbEBo1ZCgQ=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=MAbv6mJXCM/kEyTJd4VnpJCq/Onnm1xLlIaRb4RPBT0oYuLpi5Dwa7QEUlm8C56cRQ PCwF45yy4yn/7ksRR6EToCfy4r+t/wPFbBsEWn5vtwMkAYY8HTD1P+uqrjwM0Wb2tUww g/8XmMa54TBHpXNcdKDxtYKUvk52nTPoFTpkrFniU4KUkwA0jSSjC123LaqqxmbtSj83 5LuFDJUMuuFSr9pLsRzWU7t8VTmLXzf8mu5afEIN57rvKLa9OQq/fjTAfpO47oHmkCEA /KW4G2CgSrX6LVIYl2dq148sFZhjjvbBGVaFWXQ9ED5B7tHMnmvGEPOy7fzzmYnYMHXc 8krw==; 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=jMMMV9W1; 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 b15-20020a056402278f00b00568b56268c7si4128084ede.166.2024.03.31.19.00.37; Sun, 31 Mar 2024 19:00:37 -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=jMMMV9W1; 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 291FF68CDAE; Mon, 1 Apr 2024 05:00:18 +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 71B7A68CDDB for ; Mon, 1 Apr 2024 05:00:11 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id A4B891BF208 for ; Mon, 1 Apr 2024 02:00:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1711936810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=FyAhETk7ZM0D/aFIHhEHdLYN6N7k0Vo1NCpoUB6HnYs=; b=jMMMV9W18wGacpQMp96iXCFGDwUxcKW6lR/N0q083VdtjC/2q5EC2TO1gC4vhlMYX+igxp uP+lAsi6PRXS23j/4OPYbo/eF49DqzR+d23Rn8Mov6qixDRmDNwnWahDOiUPNNOg+z9B7R ldhOZoHp2WkBrXGK9lg64KzrRPftZT1S8GV7yadX+6Cpulz1GrULqeZnmdy7S1xZH8zggV JBs4V/UpN+dSAHba7FjXjxHkXzQKcse5q7eOs95wy5lfi8YeH41PHfN7hnt6qkVUdjAVKB srTrVh7nNwVx1ywPeUj3neTlaa1e3A2h0aZvexXauwY02qTcoLPZxqb+Ztj8Vg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Apr 2024 04:00:06 +0200 Message-Id: <20240401020006.12107-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240401020006.12107-1-michael@niedermayer.cc> References: <20240401020006.12107-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/hevcdec: Fix null dereference in hevc_frame_end() 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: HN8RKY8oUPw2 Fixes: member access within null pointer of type 'const AVFilmGrainParams' (aka 'const struct AVFilmGrainParams') Fixes: 67701/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-6595117570916352 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevcdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 752459af2d3..2514d522ba5 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2945,6 +2945,8 @@ static int hevc_frame_end(HEVCContext *s) if (out->needs_fg) { av_assert0(out->frame_grain->buf[0]); fgp = av_film_grain_params_select(out->frame); + if (!fgp) + return 0; switch (fgp->type) { case AV_FILM_GRAIN_PARAMS_NONE: av_assert0(0);