From patchwork Mon Jun 19 06:15:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 42222 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp477625pzb; Sun, 18 Jun 2023 23:19:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6P/sLiIYQwFFJ/vQgEW0gKkyNAPFHwALb5ErsOBBwDQcjoHGIpkWf0PK4npbPuZk4v3XqD X-Received: by 2002:aa7:c749:0:b0:51a:542b:ece1 with SMTP id c9-20020aa7c749000000b0051a542bece1mr1124904eds.27.1687155578224; Sun, 18 Jun 2023 23:19:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687155578; cv=none; d=google.com; s=arc-20160816; b=O+8uSClT37jZjWSuLXFcE30FX8Bjnd3m4ocDCBCRDIkgLQ+phKobm4XlKPRzxmLroS /TnEu2RGyzOS/YQhIbPeTm+oTtRFp5irCslt108XGh0TgfVzOHhprHNxvNt4EOSyyX72 Ovu/wqV+iExWVhKvJWR+rEyusrLtRlOFqY57LRlkEcJ/8hQrGupsDEVP21oAwpKlibPP MVRFwiG7pMJs61cDTVruu7vja9AnXTh0/j81jSBoXYn23UMZGutc++1MQKIZAxB7sCeb jrUV4U1G2vPPiTZCWvKpXbK4I8sLbUepOJ+F5/2usvgl+grcc/gLmVsYQniebojN0oBd jAvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=40/Y6lB6kjPmLQZcEsETV1wQCr31mVI8wfuwalG+Xyk=; b=blUG00UyrlSxhCh6FK2mXGRrJ7sLgRNasw5m2QttS6u3AwnjAk0/69ZWgWLfGeF3Zq 2tUZqQ6pfaloMArRfikHexrjUsVDLQyPC3MLEjGcerpZ7st3ha7DsWxeXziYjTy5SVRt /mhHrlhRWZPHGvHRiFb5SiyNWRgCfaDE+3O7AqFZu5RxSksi3odSf0kIA6Eryw3UCMZK t5n0kDXYfOp3e+0vFYaLY16/PFrfnUxw3kMeMniLDeCVQhgmlRUrLqYha/5xG1gHM/+/ yoTQU89eJhDs7aFUj2vpb821fNhdT1HUTkRrvcC+CQpsm3NB5MJTaNwnr/4oEMHIc7O5 Vugg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="FXE/fsMk"; 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 e23-20020a50ec97000000b0051a5a6676dfsi687475edr.23.2023.06.18.23.19.37; Sun, 18 Jun 2023 23:19:38 -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=@intel.com header.s=Intel header.b="FXE/fsMk"; 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 284336808CC; Mon, 19 Jun 2023 09:19:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BEFC468BDDE for ; Mon, 19 Jun 2023 09:19:26 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687155571; x=1718691571; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=13RhCQYd88z16FYBu6gavqUP0t3KaHeRWcBUbwvy2jA=; b=FXE/fsMklx7XtBl6MrtVgJ6iqBuPhnXl3iha+zCGUQ8cJrV3y5eAbxnP Im6s7l2UxwsUfnGUSARzSUlaizwzKfTkxcLRYU1IZ8TIbwQzv+9Z+CdFp CwawIu09eBQ7XZ7s79EDlLWpcwvRCf2muIHGvjlSwbeU+bdFPkrm0R/dG ESbYxW+ALAvkTVLQEmRpBZuRDSYhj1i0EaGD1JU3tl3STCRk54bx0QfcF qp9oaNtH2igBtEPTAoAaxkl1qOpOC7/n3OK3z6vjuPNMTkzfz3Y97IDPz VXE82Y38orFX6HgJ6/LtqRG1VV7KEuuCohh91LHwIP4Sx34KRpqnc8SkF w==; X-IronPort-AV: E=McAfee;i="6600,9927,10745"; a="362089623" X-IronPort-AV: E=Sophos;i="6.00,254,1681196400"; d="scan'208";a="362089623" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jun 2023 23:19:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10745"; a="858099902" X-IronPort-AV: E=Sophos;i="6.00,254,1681196400"; d="scan'208";a="858099902" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.59]) by fmsmga001.fm.intel.com with ESMTP; 18 Jun 2023 23:19:22 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Jun 2023 14:15:07 +0800 Message-ID: <20230619061509.1363-1-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/3] avutil/hwcontext_qsv: register free function for device_derive 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 Cc: Tong Wu , Wenbin Chen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wXbiZnjPIF+g When qsv device is created by device_derive, the ctx->free function is not registered, causing potential memory leak because of not properly closing the MFX session. Signed-off-by: Tong Wu Signed-off-by: Wenbin Chen --- libavutil/hwcontext_qsv.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 4ed4242ddf..878ecd886e 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -2094,6 +2094,15 @@ static int qsv_device_derive(AVHWDeviceContext *ctx, AVDictionary *opts, int flags) { mfxIMPL impl; + QSVDevicePriv *priv; + + priv = av_mallocz(sizeof(*priv)); + if (!priv) + return AVERROR(ENOMEM); + + ctx->user_opaque = priv; + ctx->free = qsv_device_free; + impl = choose_implementation("hw_any", child_device_ctx->type); return qsv_device_derive_from_child(ctx, impl, child_device_ctx, flags);