From patchwork Fri Jul 24 07:29:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 21245 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0EFE0448E76 for ; Fri, 24 Jul 2020 10:29:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DD65768B66C; Fri, 24 Jul 2020 10:29:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15A0268B60E for ; Fri, 24 Jul 2020 10:29:08 +0300 (EEST) IronPort-SDR: 3eAJP9wJHEFgo6cH62mv1oCabnubccB7GZsJW7o4QODdg4pBOIii4luKoWpM0QOMC6n2kDWTti h1pOR3iNS9ew== X-IronPort-AV: E=McAfee;i="6000,8403,9691"; a="148587704" X-IronPort-AV: E=Sophos;i="5.75,389,1589266800"; d="scan'208";a="148587704" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jul 2020 00:29:05 -0700 IronPort-SDR: 7S4wdodikSHpwcL6pHFgk9/rKPZkl0plt1Ok5ATduugnaZjxWTvJLZ867lrOZYyDGDiIF0l3Sr 28rDfNs7Em/Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,389,1589266800"; d="scan'208";a="432998730" Received: from xhh-tgl64.sh.intel.com ([10.239.159.152]) by orsmga004.jf.intel.com with ESMTP; 24 Jul 2020 00:29:05 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Jul 2020 15:29:03 +0800 Message-Id: <20200724072903.1172232-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] hwcontext_vaapi: avoid fd leak in vaapi_device_derive X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavutil/hwcontext_vaapi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index fb9be19647..a4dfaba92c 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -1698,8 +1698,12 @@ static int vaapi_device_derive(AVHWDeviceContext *ctx, #endif priv = av_mallocz(sizeof(*priv)); - if (!priv) + if (!priv) { + /* fd is opened in this function */ + if (fd != src_hwctx->fd) + close(fd); return AVERROR(ENOMEM); + } if (fd == src_hwctx->fd) { // The fd is inherited from the source context and we are holding