From nobody Sun May 5 17:08:14 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+48876+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+48876+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571018930; cv=none; d=zoho.com; s=zohoarc; b=dOM+m8b+wRCXspNaGvXVNC/Jj2JPC//oax0buujWXupKB7lCfyAWwLm3QYvgiYReG3QDggsMh5ZgHPS7pdmHjhpADBsPYQm7DnOTXrSHA5R0xrytqD6F4YVlEtQY2AoS1aY5pZ1csS7tMwbRIMbdm6texjh1YjfWDrlypZ2y1VU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571018930; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=y4kcrVgWAQmak9F8tlHlqQWxZbf2EpzQUa28/RsBrQU=; b=jqI0/eo6SqDWnJB2rNj3pHbI/f1MbE1HhypJpt7LtGCFNsSCq5AnQvAj349p4s9bHBKsL0A/t5nL6XzJcx8K/bOnuLWlba/vidgT/XN/MTY1bUFPLVfwq/VdWwZDeGIDhvjZ6FL03lUg0MDOfJOfD7ScqVCx4/se9anxwqAIaJc= 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+48876+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 1571018930141850.9262125128475; Sun, 13 Oct 2019 19:08:50 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id aaaaYY1788612xaaaaaaaaaa; Sun, 13 Oct 2019 19:08:49 -0700 X-Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.13306.1571018929175270733 for ; Sun, 13 Oct 2019 19:08:49 -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 orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Oct 2019 19:08:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,294,1566889200"; d="scan'208";a="199267127" X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga006.jf.intel.com with ESMTP; 13 Oct 2019 19:08:47 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Siyuan Fu , Jiaxin Wu Subject: [edk2-devel] [PATCH] NetworkPkg/IScsiDxe: Fix the index of array TargetUrlp[] Date: Mon, 14 Oct 2019 10:08:45 +0800 Message-Id: <20191014020845.2216-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=1571018929; bh=NkYZLoCgvDfTe8s12decBcS79dAjKP3qfmJNGwc+hJc=; h=Cc:Date:From:Reply-To:Subject:To; b=ciRDqS0v61JnsLK+zdl1up/QrQJQpDFWxZgk6e3GieVU7RhhvGrG5vW6lcP3N/lp0FL wh5MJqapjvIITz8fjCkcnXVSAiC0xsOYYODgEW5NneMtwTx3h0idVZ94bXkBqY8SurXJm X5HNH5SXzY7jmZFAmfX3j6PH3q2zeQrNXmI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" After the expression, 'CopyMem (&ConfigNvData->TargetUrl, Field->Str, Field->Len);', the '\0' should be set to TargetUrl[Field->Len] rather than TargetUrl[Field->Len + 1]. Besides the boundary check should be more strict. Field->Len should range from 0-254 rather than 0-255. Cc: Siyuan Fu Cc: Jiaxin Wu Signed-off-by: Shenglei Zhang --- NetworkPkg/IScsiDxe/IScsiDhcp.c | 7 ++++--- NetworkPkg/IScsiDxe/IScsiDhcp6.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/NetworkPkg/IScsiDxe/IScsiDhcp.c b/NetworkPkg/IScsiDxe/IScsiDhc= p.c index d8c9fff6c65d..eac5b39991b7 100644 --- a/NetworkPkg/IScsiDxe/IScsiDhcp.c +++ b/NetworkPkg/IScsiDxe/IScsiDhcp.c @@ -122,11 +122,12 @@ IScsiDhcpExtractRootPath ( // if ((!NET_IS_DIGIT (*(Field->Str))) && (*(Field->Str) !=3D '[')) { ConfigNvData->DnsMode =3D TRUE; - if (Field->Len > sizeof (ConfigNvData->TargetUrl)) { - return EFI_INVALID_PARAMETER; + if (Field->Len >=3D sizeof (ConfigNvData->TargetUrl) { + Status =3D EFI_INVALID_PARAMETER; + goto ON_EXIT; } CopyMem (&ConfigNvData->TargetUrl, Field->Str, Field->Len); - ConfigNvData->TargetUrl[Field->Len + 1] =3D '\0'; + ConfigNvData->TargetUrl[Field->Len] =3D '\0'; } else { ConfigNvData->DnsMode =3D FALSE; ZeroMem(ConfigNvData->TargetUrl, sizeof (ConfigNvData->TargetUrl)); diff --git a/NetworkPkg/IScsiDxe/IScsiDhcp6.c b/NetworkPkg/IScsiDxe/IScsiDh= cp6.c index 86a872adeccc..be66e6684a0e 100644 --- a/NetworkPkg/IScsiDxe/IScsiDhcp6.c +++ b/NetworkPkg/IScsiDxe/IScsiDhcp6.c @@ -161,11 +161,12 @@ IScsiDhcp6ExtractRootPath ( // Server name is expressed as domain name, just save it. // if (ConfigNvData->DnsMode) { - if (Field->Len > sizeof (ConfigNvData->TargetUrl)) { - return EFI_INVALID_PARAMETER; + if (Field->Len >=3D sizeof (ConfigNvData->TargetUrl)) { + Status =3D EFI_INVALID_PARAMETER; + goto ON_EXIT; } CopyMem (&ConfigNvData->TargetUrl, Field->Str, Field->Len); - ConfigNvData->TargetUrl[Field->Len + 1] =3D '\0'; + ConfigNvData->TargetUrl[Field->Len] =3D '\0'; } else { ZeroMem(&ConfigNvData->TargetUrl, sizeof (ConfigNvData->TargetUrl)); Status =3D IScsiAsciiStrToIp (Field->Str, IpMode, &Ip); --=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 (#48876): https://edk2.groups.io/g/devel/message/48876 Mute This Topic: https://groups.io/mt/34529164/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-