From patchwork Wed Jul 31 19:54:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50839 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:12d6:0:b0:489:2eb3:e4c4 with SMTP id 205csp716372vqs; Wed, 31 Jul 2024 13:02:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVrdPhPBch5eR1K5ajkuWLXwF7bSkeUd9g4witMF1qAzUqGcDXWcW+mr15bxEoewNPPL72Yz3NTul4YsMtjHXLQfXvBndYgM0sAew== X-Google-Smtp-Source: AGHT+IFx4VXmygnI677vsat0BfGgOXdy2FE0sxaIXZnDeSXFWhs4AiRAeTskUK/4pGad+GRMGju3 X-Received: by 2002:a05:6512:2c0c:b0:52c:8b69:e039 with SMTP id 2adb3069b0e04-530b61aaf06mr73302e87.4.1722456120915; Wed, 31 Jul 2024 13:02:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722456120; cv=none; d=google.com; s=arc-20160816; b=lEdM3098s9Kb+wJBegCy3MBLajOhY0VFy3Y3kImMhkqsDswckHJqcDqRuVcn2R/Fwn XQxkDgMrFmEUeETjBFa/RZ5jxmGpPDWhspfKA17jUlwp/XaCySnmjQKnsbUlXBVGJOaf O73SeYbiLsjJSJA/kv8ISulQCzQG57Bhb8BXslx0XAHa/XB5xGv5MAvrRId77FE3/iXi gNRGNZhpIOfA00X0vOId2I7BIOJ4p7KKMckpAbjhTtOuqIV5Q1RFJcjGSJy8hbzDKzoQ NhiNlOwTSRILYpMMEOftrxuNcJqS3xVGMNXtxPY2izj+pGkC687pJEgA2ZTdoXJBVS6K fYaQ== 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=Ftgs0RsfVcFlwq4xqUzlG+MU/+4wPbMz0WSjkALvves=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=gWB17WZzCKfLz2OhyvTSd28z7QKyo6FketJtakMRdNz0l17VQeFPW8OpKB5RTg22m6 j0vJRNpVZXerXnsJ24WheeeUgygz6HkcM+dH7fyCximxExUf2CFwoGeiq2k/y33czqWk RXIHmBokyr5OxJqcJrs9zhTyKQ/RS3MJmNeUKglxxH3R/2sOhGMTkMsRN0LAtsJC69GP +A4Czp5jaRpOGpdg4GXRLWHAl6whVktAtdGD3XzaAi/vSY5dSJZvC6K7c9EFhQ49u4ty 4RlYUmHKYWRczg5fSwkNmV+b3f91UyiQNHjhioqY0+w3fiWS5ArEsq2Xvze9HcBOx8M9 6Cig==; 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=A+sWXh5H; 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-52fd5c05aa3si4403614e87.502.2024.07.31.13.02.00; Wed, 31 Jul 2024 13: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=A+sWXh5H; 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 0E38868D91A; Wed, 31 Jul 2024 22:54:27 +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 3FA3C68D8EA for ; Wed, 31 Jul 2024 22:54:16 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 999D11BF203 for ; Wed, 31 Jul 2024 19:54:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1722455655; 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=n6waCTR/W5Anaqn5bae/m0xLw2w+stlKIbnr+5MG8bE=; b=A+sWXh5HdYeCezkecxqDI+/qI/DPx42dYr+A/v06+ELGmznbcsk1a6U8FpBJGu5uLJcayQ uxzXUaQ2zu7KqK8ASb9VH8xxCcPoLoyDciYThpa6lgBFNo+3sBsA+mkm0drCjZn04UMafk ks9Yp5hLkYuIn5lG6u5d7nnZJ7xyjUY7j5WufXZwJgS+2Vth1BMdEYcJApnxYixIA1q8SZ uzbjoeMv0ueqlLXatwfwOTKUhxjUhsXq9OxloEF5JKDKK5V7t7tNmUvehu9SfjSEmGtizR x5cKLR5SXT1HeQkjdAcSbjX4XIV8LbXbQUlqohefbWmxioLHyVEGnMO051rZQQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 31 Jul 2024 21:54:10 +0200 Message-ID: <20240731195410.274508-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240731195410.274508-1-michael@niedermayer.cc> References: <20240731195410.274508-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/snow: Fix off by 1 error in run_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: 97ZSE0Xft4Bb Fixes: out of array access Fixes: 70741/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SNOW_fuzzer-5703668010647552 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/snow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 0285362d439..af6214d0778 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -428,7 +428,7 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){ !FF_ALLOCZ_TYPED_ARRAY(s->spatial_dwt_buffer, width * height) || //FIXME this does not belong here !FF_ALLOCZ_TYPED_ARRAY(s->temp_dwt_buffer, width) || !FF_ALLOCZ_TYPED_ARRAY(s->temp_idwt_buffer, width) || - !FF_ALLOCZ_TYPED_ARRAY(s->run_buffer, ((width + 1) >> 1) * ((height + 1) >> 1))) + !FF_ALLOCZ_TYPED_ARRAY(s->run_buffer, ((width + 1) >> 1) * ((height + 1) >> 1) + 1)) return AVERROR(ENOMEM); for(i=0; i