From nobody Thu Apr 25 01:58:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49658+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49658+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1572443139; cv=none; d=zoho.com; s=zohoarc; b=OHtWm3B+Hr+M0SFlVbr2Z+p1+Ye9RJ8OR31gEGcgv2a1mI2q7V5+MLmXuiV6mz214Ke6n++/+2JWpXzTudeOOOSngBDe29xfaONEjFAlGlJ5GigfuHR1/XPSEq8CJYdXWqL8zXB41rbKlnl8ThWLsAxo/959QS/z61jg88Bbgas= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572443139; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=Lsy3bksFFkG6urYnQovl/aD9or2C/bpZUOk7xqPYlo0=; b=ZorDjQZbi5FSM6kz1rIdlX8SR8n+GQlM9KZB1zew2h9pSH9eMMpNez7tHhNzMa58zp05yv0dTkuHUIP3nGrtd/vX5etxGBbl7c1RoK8kefEO1Ewo64cikphKHzgyQydAwRlDi3Cqhxsc1XyKJAFzUqySNJjFMmcppxJDImrDmQ0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49658+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 1572443139560603.0077661327721; Wed, 30 Oct 2019 06:45:39 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id aaaaYY1788612xaaaaaaaaaa; Wed, 30 Oct 2019 06:45:39 -0700 X-Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web11.5099.1572443138470098671 for ; Wed, 30 Oct 2019 06:45:38 -0700 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; 30 Oct 2019 06:45:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,247,1569308400"; d="scan'208";a="203883434" X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga006.jf.intel.com with ESMTP; 30 Oct 2019 06:45:36 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Dandan Bi , Eric Dong Subject: [edk2-devel] [PATCH v2] MdeModulePkg/HiiDatabaseDxe: Add check for 'Private->Attribute >> 4' Date: Wed, 30 Oct 2019 21:45:32 +0800 Message-Id: <20191030134532.31248-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=1572443139; bh=WV1ruIQWKaJfwgb22b9/dzGIcsnqzvNxos2Xbdtmmvk=; h=Cc:Date:From:Reply-To:Subject:To; b=CpBKGBFYkHhWDx2XJxzYmTqcfydPZ1CSRivG37DPVWHMo2vBjH2XMfQMkAIcXtCp93d TFBSEngBBkdaU5BpnN6AlFx1/gnPehKTIuDwrnyhm+c0oRPcBj8fwBbQoi82B7EdaNDh2 JGNO2/cgkxkcjkgxmacP2UsvFOf4zJvQkmE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The size of mHiiEfiColors is 16. mHiiEfiColors[Private->Attribute >> 4] may be out of boundary. So add a check for that. Cc: Dandan Bi Cc: Eric Dong Signed-off-by: Shenglei Zhang --- v2: Instead of returing value, we add ASSERT to ensure "Private->Attribute >> 4" is not out of boundary. MdeModulePkg/Universal/HiiDatabaseDxe/Font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c b/MdeModulePkg/Un= iversal/HiiDatabaseDxe/Font.c index ca63df168c94..1eee5ec76bb0 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c @@ -999,6 +999,7 @@ GetSystemFont ( } =20 Info->ForegroundColor =3D mHiiEfiColors[Private->Attribute & 0x0f]; + ASSERT ((Private->Attribute >> 4) < 16); Info->BackgroundColor =3D mHiiEfiColors[Private->Attribute >> 4]; Info->FontInfoMask =3D EFI_FONT_INFO_SYS_FONT | EFI_FONT_INFO_SYS_= SIZE | EFI_FONT_INFO_SYS_STYLE; Info->FontInfo.FontStyle =3D 0; --=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 (#49658): https://edk2.groups.io/g/devel/message/49658 Mute This Topic: https://groups.io/mt/39783598/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-