From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 6FEC7D811DC for ; Thu, 11 Jan 2024 09:14:55 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=5IDsv6HhMDLF+YL7VqaFYr5zCwPKF3WcoqBKo4/xiNw=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1704964494; v=1; b=ZDQbdJNGYrbo+ug5v8JJmqjPUjZOzCK7Hmivi1CBRzR2HQNIjA/Jkg3uQynIS52PTMvB7Kot oHZA2qFFODlnwO7cqmdGDcZdvcdrl+Fovmk72pL6AAdWpmcYlx+IaRTIoqWs9SDxa1cRkl9hcao JwW7lzE2KcdC9gnbIcRicJI8= X-Received: by 127.0.0.2 with SMTP id 2fPpYY7687511xehn6TFjDPx; Thu, 11 Jan 2024 01:14:54 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by mx.groups.io with SMTP id smtpd.web10.7837.1704964493484827151 for ; Thu, 11 Jan 2024 01:14:53 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10949"; a="20272661" X-IronPort-AV: E=Sophos;i="6.04,185,1695711600"; d="scan'208";a="20272661" X-Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jan 2024 01:14:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,185,1695711600"; d="scan'208";a="16979419" X-Received: from gguo-desk.gar.corp.intel.com ([10.225.76.26]) by fmviesa002.fm.intel.com with ESMTP; 11 Jan 2024 01:14:48 -0800 From: "Guo, Gua" To: devel@edk2.groups.io Cc: gua.guo@intel.com, Marc Beatove , Ard Biesheuvel , Sami Mujawar , Ray Ni , John Mathew , Gerd Hoffmann Subject: [edk2-devel] [PATCH v2 2/4] StandaloneMmPkg/Hob: Integer Overflow in CreateHob() Date: Thu, 11 Jan 2024 17:14:37 +0800 Message-Id: <20240111091439.1767-3-gua.guo@intel.com> In-Reply-To: <20240111091439.1767-1-gua.guo@intel.com> References: <20240111091439.1767-1-gua.guo@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,gua.guo@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: wIzdfhhPUdQHoJslS01xzCx0x7686176AA= Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=ZDQbdJNG; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none) From: Gua Guo REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4166 Fix integer overflow in various CreateHob instances. Fixes: CVE-2022-36765 The CreateHob() function aligns the requested size to 8 performing the following operation: ``` HobLength =3D (UINT16)((HobLength + 0x7) & (~0x7)); ``` No checks are performed to ensure this value doesn't overflow, and could lead to CreateHob() returning a smaller HOB than requested, which could lead to OOB HOB accesses. Reported-by: Marc Beatove Reviewed-by: Ard Biesheuvel Cc: Sami Mujawar Cc: Ray Ni Cc: John Mathew Authored-by: Gerd Hoffmann Signed-off-by: Gua Guo --- .../StandaloneMmCoreHobLib/Arm/StandaloneMmCoreHobLib.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneM= mCoreHobLib.c b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/Standalo= neMmCoreHobLib.c index 1550e1babc..bb8426dc0a 100644 --- a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmCoreHo= bLib.c +++ b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/Arm/StandaloneMmCoreHo= bLib.c @@ -34,6 +34,13 @@ CreateHob ( =0D HandOffHob =3D GetHobList ();=0D =0D + //=0D + // Check Length to avoid data overflow.=0D + //=0D + if (HobLength > MAX_UINT16 - 0x7) {=0D + return NULL;=0D + }=0D +=0D HobLength =3D (UINT16)((HobLength + 0x7) & (~0x7));=0D =0D FreeMemory =3D HandOffHob->EfiFreeMemoryTop - HandOffHob->EfiFreeMemoryB= ottom;=0D --=20 2.39.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113606): https://edk2.groups.io/g/devel/message/113606 Mute This Topic: https://groups.io/mt/103658960/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-