From patchwork Sun Jun 30 23:12:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50226 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1459928vqv; Sun, 30 Jun 2024 16:13:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXbHu8y0HKgOaZNVf1jVg6Z0mRXDn3Sben7uPKoHsLK1topGICTrqHsCcD4iQoh4aNhyb08NqB3m281Yzt74J7v+/embvdyIMiscg== X-Google-Smtp-Source: AGHT+IFQiB2D+bzBBLcmGberA3PAmjW+KUa+Nt4prikv3ANUJQzg9ucF1k/ibgAb4yQZ7m9+2zlh X-Received: by 2002:a05:6512:31c8:b0:52c:e0bc:ca3a with SMTP id 2adb3069b0e04-52e8273cc4dmr2813393e87.64.1719789211504; Sun, 30 Jun 2024 16:13:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719789211; cv=none; d=google.com; s=arc-20160816; b=lKr/5jRIdK2XBjx1j59yy3edrnyCLpTCqizZ57UrrSu1n/LMidsmwyLT/IiLFzeWse dTstHR+weQJAEHQcGAyEWSNFfUyuceO6JAOVvT62dLYa029YEz2SvBBdhBqCZg0Fb4JC /R2u9pGaOrFTIoWGeupb1DP0+hHUHO+tTDXX1AhBAwZcicVCXcyz+Bgt5VPHFLxurf5a GeZBU2vRaV3KX7RvshWh6E7rmLVUzzifNsIdNL94nY1qAon5VjdoTdTGvbybmAqGYCM7 Ydd8UuKtqnrC5lqonbxUm2DOzzBf4bs1Nci+A1aDtvuk/cZlcA7BmXhxeThlUfh9tpVn du+A== 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=foojpt0fGi2sBaoUI4g9OJVw/CnfnqHFbU1eVqh4wFA=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=SRizaCuYmvmuoOkv90fxqfSdVfo5X5EIIN0kK5Y1L6EGZAr1BVap0SDaL80QB332Ma E8vU5OcJL77zm0P9W3FL91XYBgDW+gieaVW1PTGH23gyqKwqY4FuzMRvGlvU2XiEfDMO sH248BeoRqZy8eE1kZG4+KnuVpuhUoCnTXGCYZNKcbpewoIDQ4Q+czSRwitGF1ZfBOUW 4BK4QCxmGHwQYcVrFTHvyiOXSwgfMf8sPscazWEfJ5OIKfX1/5joFDDh+ZqnPwsurVg2 BEGPeTsPlEKxW61Icbi6k4gAwvrI4dvNiQpvb9KIgz7Wr1FLIyAbwwGpw+04Nsv+fhJl PleQ==; 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="oR/jNLCP"; 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-52e7ab31f64si1870487e87.545.2024.06.30.16.13.31; Sun, 30 Jun 2024 16:13:31 -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="oR/jNLCP"; 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 74F2768D673; Mon, 1 Jul 2024 02:13:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 79F9468D31F for ; Mon, 1 Jul 2024 02:13:09 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id BF0C540004 for ; Sun, 30 Jun 2024 23:13:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719789188; 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=v2LGrp4Wq//p+qhVuN0IqOGOZYd61/iTLAncVt7lgaE=; b=oR/jNLCPmjwnv/TQ4pcNkAPQTIt09SVlcYEJ5XZnJzc0p47rbf8OnUSoXCtsjfnuwbJhI1 jt+gtI+8Pm3lnaupJ9gAWRVsvZPDUSlbyOjK/T1FVRxuDwpxwrFvZMx7vHaBSGnxkC3GUo /5pIuE0T8D6GOPYRr6NXePYU0cooEEFCx9EXWXtGBEJhtukUUsZTrKr/k5P9eWpFr494Yj pQZuDj7eBlRzhujAB3guyTuYG/HlPq6PXL3JwTeB1df+DZKSpG3v1NmLUJmNgoz+n7Ij41 9bRd24RcPXi0zlzX3Z/sJuZ5NZAtClvBwJRnAH2TC91BqQeXcn0j7JLWx9xmLg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Jul 2024 01:12:41 +0200 Message-ID: <20240630231306.3779027-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630231306.3779027-1-michael@niedermayer.cc> References: <20240630231306.3779027-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 02/11] avcodec/vvc/dec: Check ff_init_cabac_decoder() 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: qh8mW/+QZL99 Fixes: signed integer overflow: 1107820800 + 1107820800 cannot be represented in type 'int' Fixes: left shift of 1091059712 by 6 places cannot be represented in type 'int' Fixes: 69910/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VVC_fuzzer-5162839971528704 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vvc/dec.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index a6b601b778c..563f6fcf082 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -476,13 +476,14 @@ static int slices_realloc(VVCFrameContext *fc) return 0; } -static void ep_init_cabac_decoder(SliceContext *sc, const int index, +static int ep_init_cabac_decoder(SliceContext *sc, const int index, const H2645NAL *nal, GetBitContext *gb, const CodedBitstreamUnit *unit) { const H266RawSlice *slice = unit->content_ref; const H266RawSliceHeader *rsh = sc->sh.r; EntryPoint *ep = sc->eps + index; int size; + int ret; if (index < rsh->num_entry_points) { int skipped = 0; @@ -501,8 +502,11 @@ static void ep_init_cabac_decoder(SliceContext *sc, const int index, size = get_bits_left(gb) / 8; } av_assert0(gb->buffer + get_bits_count(gb) / 8 + size <= gb->buffer_end); - ff_init_cabac_decoder (&ep->cc, gb->buffer + get_bits_count(gb) / 8, size); + ret = ff_init_cabac_decoder (&ep->cc, gb->buffer + get_bits_count(gb) / 8, size); + if (ret < 0) + return ret; skip_bits(gb, size * 8); + return 0; } static int slice_init_entry_points(SliceContext *sc, @@ -538,7 +542,9 @@ static int slice_init_entry_points(SliceContext *sc, fc->tab.slice_idx[rs] = sc->slice_idx; } - ep_init_cabac_decoder(sc, i, nal, &gb, unit); + ret = ep_init_cabac_decoder(sc, i, nal, &gb, unit); + if (ret < 0) + return ret; if (i + 1 < sc->nb_eps) ctu_addr = sh->entry_point_start_ctu[i];