From patchwork Tue Jun 11 21:59: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: 49813 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c504:0:b0:460:55fa:d5ed with SMTP id c4csp100084vqq; Tue, 11 Jun 2024 14:59:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUnsOyfNSf1zzrGAv6Ql461/KPpK1WKpyI3r2zJXvJr7pGJyhDBnoQ1Nsw+oXktVyP3QE6fbbCSSxs8eIgzAtZYvpsVGKsgmCB6UQ== X-Google-Smtp-Source: AGHT+IHRc5s2xmxezIxUwwLdHWbxiQyJiAyliJOfkkS75rIA6ZvJ023Y19DXZviqfdxhfwhNFWun X-Received: by 2002:a5d:64c9:0:b0:35f:305d:d2c8 with SMTP id ffacd0b85a97d-35f305dd3d5mr1649794f8f.3.1718143188556; Tue, 11 Jun 2024 14:59:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718143188; cv=none; d=google.com; s=arc-20160816; b=CCYc8a5NnUgw0r1vvXUGtOQqu3WLzTO83AqUe6Dab0CIPWffHjkbdwoVZlTFxW7h3q HkQm+eWpj6Pyjsb4gciPGq6Z590Wp1JhlihBWa3CNhmeUa9jZ4en8PnhH/KpX/zo69Ye KiR712ECbCHNrUb1KqkntLYvNIAurfvDVlrQv/ReMPx1ZCLJtxxl1hdQNC5OsU2eLvIB 7DwukX+hFHcOctlOx397KWsQLhYBpIw4Ah2+NyzCmpXomZdbOgU2bIXu6fmqrtz9t9uw AjeL50Dwtfm8+tHRqmckNe2BRYVg3CqY7orY7MiaaQQ3IRPtBxQQOjmuqr+hVzUapPE/ ofPQ== 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=U+bQ5D3wOR7Enwf0HZvBWyxSb9Vlj769Kktz/dLetXw=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=TTA0dA8QyWy20HMHItyfMM6SAOzqbtyv4bN5HOSndZ5UAtETFmvUBp1utpbhiWXE2t ikGQ63aTCjsPO+M7+6c8CH77M8CObfWjyASpoPecg/y0H3f4OHtBWGn+hZq6Vjc7U6es Hau7kRrsU6VKSFBly7P8U9wm01NgX5Ths6vF6JJz40czON+md5EADiEh5/YKQTxOfzQb pZNGMhuJMYYo/uboXwZRc8hn1rRYsdoyFXyLitmuSjd3CoqgvVzTUIa0z+p1hHsWYJhO eltlNXwjLDiCJv1/s8Lk1T/C2qxPwnAb6pWx/wu6jFaaQ7lKoy8JVVKX7Hhpc97gKhtX qsJA==; 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=K3BjBQyL; 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-a6ef71f0ca0si412696666b.323.2024.06.11.14.59.48; Tue, 11 Jun 2024 14:59:48 -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=K3BjBQyL; 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 E017E68D8EF; Wed, 12 Jun 2024 00:59:20 +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 F0A7D68D876 for ; Wed, 12 Jun 2024 00:59:12 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 4FC30C0002 for ; Tue, 11 Jun 2024 21:59:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1718143152; 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=uHQXSXXE7kDxul68Tm3jz/rjw6R0oK/Fk9gbzeDjeJc=; b=K3BjBQyL8h+5JbD2qEDjjG+ZHE0HAVNYjmFtI00zdV6rxcUhk9f9i2bpAXlsXDKcfyKDs4 vstITjT5faRo3Rb00bz/p/IK0+2CG7HixparMs8luMFUpG28jfuYr2Y4GZ2GsZkV+1Sc6i m8klk3R2xQOIb0+4ZtmbyzKhgujtdOKRTAVnN41+LbNpqOsnfWBMtLwTJS+XCsq8yucp3E +FwZTWQw8VmGlvK9aPkTmboHnRUTPPnMbDkbL6geV6GQSrR85Tp5swJQA0yzEQ++R2f5wX brIB+4CBS7ffOxOnVco3Rrz/vKklPkDP7tP5KIvmZzbUHPOMaIeBg21Ac+Fh9g== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 11 Jun 2024 23:59:06 +0200 Message-ID: <20240611215906.1106071-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240611215906.1106071-1-michael@niedermayer.cc> References: <20240611215906.1106071-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 4/4] avfilter/vf_avgblur: Check plane instead of AVFrame 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: TixHfVMUoRKq Fixes: CID1551694 Use after free (false positive based on assuming that out == in and one is freed and one used) Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavfilter/vf_avgblur.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_avgblur.c b/libavfilter/vf_avgblur.c index ced0a2ac282..cbaeb974e5d 100644 --- a/libavfilter/vf_avgblur.c +++ b/libavfilter/vf_avgblur.c @@ -288,7 +288,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) const int width = s->planewidth[plane]; if (!(s->planes & (1 << plane))) { - if (out != in) + if (out->data[plane] != in->data[plane]) av_image_copy_plane(out->data[plane], out->linesize[plane], in->data[plane], in->linesize[plane], width * ((s->depth + 7) / 8), height);