From nobody Mon Dec 23 00:33:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1521183948858400.53589049069444; Fri, 16 Mar 2018 00:05:48 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8264522489C8C; Thu, 15 Mar 2018 23:59:22 -0700 (PDT) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C8A3422489C89 for ; Thu, 15 Mar 2018 23:59:20 -0700 (PDT) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Mar 2018 00:05:45 -0700 Received: from ray-dev.ccr.corp.intel.com ([10.239.9.4]) by orsmga004.jf.intel.com with ESMTP; 16 Mar 2018 00:05:44 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,313,1517904000"; d="scan'208";a="183301752" From: Ruiyu Ni To: edk2-devel@lists.01.org Date: Fri, 16 Mar 2018 15:05:43 +0800 Message-Id: <20180316070543.357716-1-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.16.1.windows.1 Subject: [edk2] [PATCH] MdeModulePkg/DxeCapsuleLibFmp: Add more check for the UX capsule X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiewen Yao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ruiyu Ni Cc: Jiewen Yao Reviewed-by: jiewen.yao@intel.com --- .../Library/DxeCapsuleLibFmp/DxeCapsuleLib.c | 21 +++++++++++++++++= ++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c b/MdeMod= ulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c index 15dbc00216..555c5971d0 100644 --- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c +++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c @@ -330,8 +330,25 @@ DisplayCapsuleImage ( UINTN Width; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; =20 - ImagePayload =3D (DISPLAY_DISPLAY_PAYLOAD *)(CapsuleHeader + 1); - PayloadSize =3D CapsuleHeader->CapsuleImageSize - sizeof(EFI_CAPSULE_HEA= DER); + // + // UX capsule doesn't have extended header entries. + // + if (CapsuleHeader->HeaderSize !=3D sizeof (EFI_CAPSULE_HEADER)) { + return EFI_UNSUPPORTED; + } + ImagePayload =3D (DISPLAY_DISPLAY_PAYLOAD *)((UINTN) CapsuleHeader + Cap= suleHeader->HeaderSize); + // + // (CapsuleImageSize > HeaderSize) is guaranteed by IsValidCapsuleHeader= (). + // + PayloadSize =3D CapsuleHeader->CapsuleImageSize - CapsuleHeader->HeaderS= ize; + + // + // Make sure the image payload at least contain the DISPLAY_DISPLAY_PAYL= OAD header. + // Further size check is performed by the logic translating BMP to GOP B= LT. + // + if (PayloadSize <=3D sizeof (DISPLAY_DISPLAY_PAYLOAD)) { + return EFI_INVALID_PARAMETER; + } =20 if (ImagePayload->Version !=3D 1) { return EFI_UNSUPPORTED; --=20 2.16.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel