From patchwork Wed Oct 23 18:14:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5b6Q5rWp5a6H?= X-Patchwork-Id: 52454 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:aaed:0:b0:48e:c0f8:d0de with SMTP id k13csp648650vqw; Wed, 23 Oct 2024 11:15:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXIxbDinRs974JMdiz5uaR+LmecxYwp7pXUs0Xdf3YXnNnXkSPfTMxjwHJoQkEOPzKNr3oLfRkdCPLykbC+36yD@gmail.com X-Google-Smtp-Source: AGHT+IEsAQG/DvOjAmglrl/9PepHxMXhbMDDqAaaZkWdhJ/he9dTzuCJ+3g1MRZciQgFAbYHbJkG X-Received: by 2002:a17:906:7313:b0:a99:c075:6592 with SMTP id a640c23a62f3a-a9abf9ab9a4mr341844166b.56.1729707317472; Wed, 23 Oct 2024 11:15:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729707317; cv=none; d=google.com; s=arc-20240605; b=JDO9VfCG0koGYyHn6yac7d/qqhFuVfsCJPE0A2swNwEVgrK5DjK3onpkDMnd6nVxsg ypeFpRxaYjlVBYWOhpkroQTfAaM42SGppipx33BOTLjgByTzeSBYewxvgeJY3oifjwt0 iIwVtTrnlv97tzki3T6ANgHYxUjrLahytokJjUk/Am9i4DGbvjos5+CBbHIp62SNC9Wh rL8FeEgtL/gvZlFRqSyjUGM/Kp/2wIX99+U93TspPNhwXOTAzECTR01QYjwhtNpt1rLJ E1Lmzwyw6Fh6IDiWyyRGTJ7SwntwIOQK258CBYQQCiRfG4XVdS7yLnUKJxRsJxeZrQI+ UgSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:to:message-id:date:from:mime-version :dkim-signature:delivered-to; bh=bJ0pMPG9sIpFmWj+GRKFZaI4uh5rg1kIchAOk3wBmwI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=UGmM0DHcMVthdIAwXaSO3C7Hd/YJ8RNFn5AGFx/4nTmoQIvhzAlD4qJov9bmZuk3I5 j1YbUM1EHpOAqM7kDEkaPNCzN/6aEJpCov21lYUVPCfE8rMzTdrVOBOz3Jlxrr0mKjYw M66B4E0DHkL5wAzXfuEWkctQ/0Cuov+DKpyiPdsNyfW9cJEYF/R8ZYiz+UsFm/6I/gsJ lJ8pRfKLcXmp36z1a1rVT1bLVMmrvjlfUhIcu6XpB2ntIB1qExttBzZA1ySI5p6cNJ4y U1BNiYqhgJeBK53tqcM4OeMvJpASnZS2Jg4n4Lz+xzikoGSTpacEY+4JtZS5H2pF4vBa VIyA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=jtFjE0Om; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a9a91577840si656952966b.964.2024.10.23.11.15.17; Wed, 23 Oct 2024 11:15:17 -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=@gmail.com header.s=20230601 header.b=jtFjE0Om; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2E04768DCEC; Wed, 23 Oct 2024 21:15:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5632D68DCAD for ; Wed, 23 Oct 2024 21:15:08 +0300 (EEST) Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-2e2d1858cdfso115002a91.1 for ; Wed, 23 Oct 2024 11:15:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729707306; x=1730312106; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=4Eol1vzGsMb5EETZbwFdwHMn8JEY1F2HL4a0fNsMvAs=; b=jtFjE0OmjCBb3ze289Fldoyo30RWJ9dD9F+Ie4wRsdeLHQ0HOKOo3iw/LoLW4AY7CJ /nTpGpYiLv0Qfm+pMJg92DP6PYHGJfZ6lbVpe75waYTNhQfLXZRNwzdtjOmkacL2UUgR G4I5Gsw5LltnLxWUC8yMpw+Ye3oHundmLIkfa/Nf17arKN9lgLQKsz/LLaNFys8HAewM 5hxeXUVFG/j6zLD4bT3CEr7kylf3n+p6GYjrvpbuiHXoqIPP0bkp8vFWu6zYf8hq1RQC 4N2zJ+gjdF8vvkovX7563KOSRgUdAg5zA89hAamfA+nOzvNIBiri1fvMqlKw0W/9xiND LkMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729707306; x=1730312106; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=4Eol1vzGsMb5EETZbwFdwHMn8JEY1F2HL4a0fNsMvAs=; b=tERMCCnCFsYAj8bIavKJKe8b9t+cDTONYzbX8EVyayxrQoCGDVsqQFEP40UQlnTV9S X0WkQ8e2dCl3H+vBSeEYYn5pD4qqbagNOFXx4I6tqCdUUAJk3XFQfwmZjYa9J/Z4gfIi wqa8ph4aQsmxMSp4J8excU0WSY3e7oDIfISxwWPMl6y9ZKh9X29MbQM7vMPNvAO4jpWw ReDWaLhWqXfEPCwDmKshKtwtMgI2mrhhvRkBIjbFRnQAyz9uuGj/u4A3wM08AMpFob0p frB3B8SdAKM56tekOaYHZKbZfuK3JHamfCkBIVRWa+rGB7Ks+cGm5Yy1bM80gb/wsRA2 Xjkg== X-Gm-Message-State: AOJu0Yx/yHm060Epo30fOT45g9WV7M3b7/knj2jn+bLz//zCYg+m0d2U 05ex9hohm9pl8/NIozlBao5aUed8W2BUrO8+aw/DiS3z38QcV99dpyl+wG1DImu+rctJbdc56FX czC1wcqWazpaoXWf4fyPw4/Nf1vjviEW3 X-Received: by 2002:a17:90b:17ca:b0:2e2:af88:2b9f with SMTP id 98e67ed59e1d1-2e76b5e90femr3453326a91.16.1729707306044; Wed, 23 Oct 2024 11:15:06 -0700 (PDT) MIME-Version: 1.0 From: =?utf-8?b?5b6Q5rWp5a6H?= Date: Thu, 24 Oct 2024 02:14:55 +0800 Message-ID: To: ffmpeg-devel@ffmpeg.org X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] avutil/hwcontext: Don't assume frames_uninit is reentrant 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: a/gjXdadnGu2 I have discovered that the vulnerability addressed by commit 3bb00c0 also affects the release/6.1 branch,but the fix has not yet been applied. Given that there were relevant commits to the release/6.1 branch just two weeks ago, I believe it is an active branch and should be properly patched.To address this, I have created this patch for release/6.1 based on 3bb00c0 . Signed-off-by: sprinkle --- libavutil/hwcontext.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c index 3650d46..0ef3479 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -363,7 +363,7 @@ int av_hwframe_ctx_init(AVBufferRef *ref) if (ctx->internal->hw_type->frames_init) { ret = ctx->internal->hw_type->frames_init(ctx); if (ret < 0) - goto fail; + return ret; } if (ctx->internal->pool_internal && !ctx->pool) @@ -373,14 +373,10 @@ int av_hwframe_ctx_init(AVBufferRef *ref) if (ctx->initial_pool_size > 0) { ret = hwframe_pool_prealloc(ref); if (ret < 0) - goto fail; + return ret; } return 0; -fail: - if (ctx->internal->hw_type->frames_uninit) - ctx->internal->hw_type->frames_uninit(ctx); - return ret; } int av_hwframe_transfer_get_formats(AVBufferRef *hwframe_ref,