From patchwork Mon Dec 30 16:02:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Oliver X-Patchwork-Id: 17070 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 336A2447732 for ; Mon, 30 Dec 2019 18:03:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 15E8168A9F3; Mon, 30 Dec 2019 18:03:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4060A68818B for ; Mon, 30 Dec 2019 18:02:56 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id d139so181113wmd.0 for ; Mon, 30 Dec 2019 08:02:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=lzWiHdP33csboaLwxpJRAWmoqJABqNI5K2Zsc0rLC44=; b=Ecv7kbb/zxXRfVRcvVr+9kC7uNv60HOMlaOWSkjsJwkSqZrqpD8CAHFeQRt/z0JqNY RqZKM7PAh5jU8nhYDS3C2pvfE00UsvJqcyIf/BEokUbFluwJuTjs8Qi/sGT/xptBxAB+ hsh6eJTp1KYmTXHC7oCXtmT5YpGIkIz7pJ6ea3ekYapPJlCnVc30c6VW+8rlp/Hg/xNu cQM0PoF7Ycgjti3uLZJ2ZdMVtEIWbqRVsBoNxaONwZhrqO97okALVG/NYnnG8ZcZGjI/ 6PscNkZqAXclZ44NvOuV0M3TXZtHlXq7xLsO3bk0eVQr55ML+9P60VpjBgUn/yc5hNK6 GlxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=lzWiHdP33csboaLwxpJRAWmoqJABqNI5K2Zsc0rLC44=; b=R6C1coqQhkZZKlkV14Imuo/T7GIUn5F8cCYhQPrtuulci4HPTipxJFseWTthd+9x1p g4JBiZROD3pZKTuOieVURiVNiyg2nXqKCnMYJYqmhHclm/tPn8TaAp0/yUrCxss7Q4mr zJoDWoU/XlDu+2siiTan5z+zHT8mPtztSbROlJeUgIbXmDx2MUYc3+2kK413jPpvtX89 DHXaVW77A8jJLlzwLbwYzJ2CWeIlv7EUT/VgYhDVnkS6xQ3kSRQJQjqURS5PbUQc9sS7 GjZKu/lNYBbDxHR7L3jCT40j/9d466X96luB32AzKZwymFDjvkgmOKgg1ywsaPsNAHcq 1YXw== X-Gm-Message-State: APjAAAV/vRVaHZE0zflZAUr5crO1oMGtZ6zTtPbzdqd5NG50/qvfXpF7 v4ZyRleBSPET+xNsl28+oy7W/iFd+bmZu6t9hBKDaoNH X-Google-Smtp-Source: APXvYqxdi+LFsVYBfywJ3JfM9X5lobKGA87+ZCAtwHGXCcE/2xit3bkDvhnhRSTdWn+7f5GBS4RZUq7wuIoOFHCIyB0= X-Received: by 2002:a7b:c851:: with SMTP id c17mr36783695wml.71.1577721775221; Mon, 30 Dec 2019 08:02:55 -0800 (PST) MIME-Version: 1.0 From: Matt Oliver Date: Tue, 31 Dec 2019 03:02:43 +1100 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] avutil/hwcontext_d3d11va: Use secure dlopen. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" dlopen contains additional security to prevent dll hijacking compared to standard LoadLibrary. --- libavutil/hwcontext_d3d11va.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) @@ -55,8 +56,8 @@ static av_cold void load_functions(void) // from too many LoadLibrary calls. HANDLE d3dlib, dxgilib; - d3dlib = LoadLibrary("d3d11.dll"); - dxgilib = LoadLibrary("dxgi.dll"); + d3dlib = dlopen("d3d11.dll", 0); + dxgilib = dlopen("dxgi.dll", 0); if (!d3dlib || !dxgilib) return; -- diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c index 6670c47579..c8ae58f908 100644 --- a/libavutil/hwcontext_d3d11va.c +++ b/libavutil/hwcontext_d3d11va.c @@ -39,6 +39,7 @@ #include "pixdesc.h" #include "pixfmt.h" #include "thread.h" +#include "compat/w32dlfcn.h" typedef HRESULT(WINAPI *PFN_CREATE_DXGI_FACTORY)(REFIID riid, void **ppFactory);