From nobody Mon Apr 29 19:14:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+51806+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51806+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1575596962; cv=none; d=zohomail.com; s=zohoarc; b=WRtFswV0YCdGj8faekSwVM7PqkobkQp71IG7kG0aihHHJ9X5KHvKC/DV/dr0jb2n4eZTuYEcw9Mkw6nP98OClGJAdgPRmc0LEgRLo3rizPf1mp3p/2WCG3KK+Q/IM8PKuflqdgJ0WnoGhhl/r6r6o+bHPHgxBma56U9oZYbHVF8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575596962; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=J9FnN/8Sbxg9JJiET45KaVQx5kpSfQPz8t9HaYjohrY=; b=ahbxT+DAaLNj0bcMGyAhOCqhiYHYDx8X2Gz52gxo7yEb5FqQFiY+5q+VQNb4qyfTxyyfWI+E/CtRr/sHpiqiek/APRxbXVNqmxT0eJVdjLE+xDWoo9+tBKm6cBSZuMeMTfzBVVeHQ95l54HazY681BO9HfPEh2j+qsmLSbW939c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51806+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1575596961968967.848480326129; Thu, 5 Dec 2019 17:49:21 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id aaaaYY1788612xaaaaaaaaaa; Thu, 05 Dec 2019 17:49:21 -0800 X-Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web09.7379.1575596960773516367 for ; Thu, 05 Dec 2019 17:49:20 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Dec 2019 17:49:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,282,1571727600"; d="scan'208";a="214297257" X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga006.jf.intel.com with ESMTP; 05 Dec 2019 17:49:19 -0800 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Jiewen Yao , Jian J Wang , Chao Zhang Subject: [edk2-devel] [PATCH] SecurityPkg/RngDxe: Add ASSERT for array Ek Date: Fri, 6 Dec 2019 09:49:12 +0800 Message-Id: <20191206014912.19944-1-shenglei.zhang@intel.com> Precedence: Bulk List-Unsubscribe: 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,shenglei.zhang@intel.com X-Gm-Message-State: aaaaaaaaaaaaaaaaaaaaaaaax1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1575596961; bh=taNx+7oZCQs5Z9KPG30I1OBMoLikiiohxFZUBrX8Emg=; h=Cc:Date:From:Reply-To:Subject:To; b=qN2RrRfVFhpo9dsI7tnSxc1g0b0xeYq4+FYoJeoyNZ4PYelROzzV/Zx3P9R5gVKEd7n yk93wEg6EHN5DzPY3cfrJbTUIWFG0SfbJ22otMLtCy267zVDne9spImfK0eS76zmcvEHD yphAQJFrVrFSqr7e9tSOXK/LROBAp65joQE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add ASSERT for Ek to ensure things out of EK would not be visited. Cc: Jiewen Yao Cc: Jian J Wang Cc: Chao Zhang Signed-off-by: Shenglei Zhang --- SecurityPkg/RandomNumberGenerator/RngDxe/AesCore.c | 2 ++ SecurityPkg/RandomNumberGenerator/RngDxe/AesCore.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/SecurityPkg/RandomNumberGenerator/RngDxe/AesCore.c b/SecurityP= kg/RandomNumberGenerator/RngDxe/AesCore.c index 66edaf10c468..6c99ec83e822 100644 --- a/SecurityPkg/RandomNumberGenerator/RngDxe/AesCore.c +++ b/SecurityPkg/RandomNumberGenerator/RngDxe/AesCore.c @@ -160,6 +160,7 @@ AesExpandKey ( // Initialize the encryption key scheduler // for (Index2 =3D Nk, Index3 =3D 0; Index2 < Nw; Index2 +=3D Nk, Index3++)= { + ASSERT(Index2 < sizeof(Ek)/sizeof(Ek[0])); Temp =3D Ek[Index2 - 1]; Ek[Index2] =3D Ek[Index2 - Nk] ^ (AES_FT2((Temp >> 16) & 0xFF) & 0xFF0= 00000) ^ (AES_FT3((Temp >> 8) & 0xFF) & 0x00FF0= 000) ^ @@ -181,6 +182,7 @@ AesExpandKey ( Ek [Index1 + Index2] =3D Ek[Index1 + Index2 - Nk] ^ Ek[Index1 + In= dex2 - 1]; } if (Index2 + 4 < Nw) { + ASSERT((Index2 +4) < sizeof(Ek)/sizeof(Ek[0])); Temp =3D Ek[Index2 + 3]; Ek[Index2 + 4] =3D Ek[Index2 + 4 - Nk] ^ (AES_FT2((Temp >> 24) & 0= xFF) & 0xFF000000) ^ (AES_FT3((Temp >> 16) & 0xF= F) & 0x00FF0000) ^ diff --git a/SecurityPkg/RandomNumberGenerator/RngDxe/AesCore.h b/SecurityP= kg/RandomNumberGenerator/RngDxe/AesCore.h index e07f90050ac3..40d6b13d2b81 100644 --- a/SecurityPkg/RandomNumberGenerator/RngDxe/AesCore.h +++ b/SecurityPkg/RandomNumberGenerator/RngDxe/AesCore.h @@ -9,6 +9,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #ifndef __AES_CORE_H__ #define __AES_CORE_H__ =20 +#include + /** Encrypts one single block data (128 bits) with AES algorithm. =20 --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#51806): https://edk2.groups.io/g/devel/message/51806 Mute This Topic: https://groups.io/mt/67403436/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-