From nobody Thu Apr 25 06:14:41 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+49657+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+49657+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1572438805; cv=none; d=zoho.com; s=zohoarc; b=DNXe0zeUU7qbw1HUEty3tc3xJuQz16IcD701J7nibKKVn/SSB3vlwxBd57HbxnRLRlo5XJ6oLko9v4+ZFMKbk/yxOcyqj/fK3sFINDUDFHojGWmwd3/Tps1CH5wZnGDLi6hNHspO1KIwnminxDY9D8PMhf+WKWKaVYqdRBmvOwI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572438805; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=pwgqfVk1P6J8jDUNSnJiSRb9BNK6e7OQD3wM+swrl2I=; b=YH7pu5DDjZgM8hhUkbgC89aiRoIjRlVIhYw3FVZrc0pNr0pe846q+mOsHZIujz38a/3kIrCAtjVJhIaWzYFVX/S3Kk+7O6Jxy4o4uprurilZQq2oF9UyOuXf2NOXzg5TiHUcciITNts4B8XXp5P7YCyZccpMuQ+ALgbjmzvk8LY= 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+49657+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 1572438805870524.7896985550702; Wed, 30 Oct 2019 05:33:25 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id UKCOYY1788612xrf0Eq0vxzC; Wed, 30 Oct 2019 05:33:25 -0700 X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web10.4249.1572438804414294061 for ; Wed, 30 Oct 2019 05:33:24 -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 orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Oct 2019 05:33:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,247,1569308400"; d="scan'208";a="203867985" X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga006.jf.intel.com with ESMTP; 30 Oct 2019 05:33:22 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Hao A Wu , Ray Ni Subject: [edk2-devel] [PATCH v2] MdeModulePkg/SdBlockIoPei: Add check for DeviceIndex Date: Wed, 30 Oct 2019 20:33:19 +0800 Message-Id: <20191030123319.19988-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: 3hx8mIuJN46xpjfhMWjtr0Enx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1572438805; bh=UVuXfCpg+W9LsfbsygkO6+TDI7hzPZaNRuunsazLhac=; h=Cc:Date:From:Reply-To:Subject:To; b=umjjX6eYxRaiPywXfNue7XABqEdhQ+Z5/Ro5tajcT9uZ6jJ1P5Chb7ZOpuqmLDiT1Iw v2HAd9BNJbKQfxc+28EpvDY/kaCzlKsyIgdckQywjmTvT8V67zfVxApY5QAbPSkhPLBrZ QHKTL1wsAJZThYPOqmp+/rOMZ6BbYKlJ+ic= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" DeviceIndex is used as index in Slot[]. The max size of Slot[] is SD_PEIM_MAX_SLOTS. So DeviceIndex should be checked before used. Cc: Hao A Wu Cc: Ray Ni Signed-off-by: Shenglei Zhang Reviewed-by: Hao A Wu --- v2. Update the check boundary from "SD_PEIM_MAX_SLOTS-1" to "SD_PEIM_MAX_SLOTS". Beacuse DeviceIndex is used as "DeviceIndex-1" in arrays. MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.c b/MdeModulePkg= /Bus/Sd/SdBlockIoPei/SdBlockIoPei.c index 8fa58d65b22c..ebd8270ce8e0 100644 --- a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.c +++ b/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.c @@ -174,7 +174,7 @@ SdBlockIoPeimGetMediaInfo ( =20 Private =3D GET_SD_PEIM_HC_PRIVATE_DATA_FROM_THIS (This); =20 - if ((DeviceIndex =3D=3D 0) || (DeviceIndex > Private->TotalBlkIoDevices)= ) { + if ((DeviceIndex =3D=3D 0) || (DeviceIndex > Private->TotalBlkIoDevices)= || (DeviceIndex > SD_PEIM_MAX_SLOTS)) { return EFI_INVALID_PARAMETER; } =20 @@ -252,7 +252,7 @@ SdBlockIoPeimReadBlocks ( return EFI_SUCCESS; } =20 - if ((DeviceIndex =3D=3D 0) || (DeviceIndex > Private->TotalBlkIoDevices)= ) { + if ((DeviceIndex =3D=3D 0) || (DeviceIndex > Private->TotalBlkIoDevices)= || (DeviceIndex > SD_PEIM_MAX_SLOTS)) { return EFI_INVALID_PARAMETER; } =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 (#49657): https://edk2.groups.io/g/devel/message/49657 Mute This Topic: https://groups.io/mt/39770853/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-