From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web12.14010.1571022875605390694 for ; Sun, 13 Oct 2019 20:14:35 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: shenglei.zhang@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Oct 2019 20:14:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,294,1566889200"; d="scan'208";a="199281697" Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga006.jf.intel.com with ESMTP; 13 Oct 2019 20:14:34 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Siyuan Fu , Jiaxin Wu Subject: [PATCH v2] NetworkPkg/IScsiDxe: Fix the index of array TargetUrlp[] Date: Mon, 14 Oct 2019 11:14:32 +0800 Message-Id: <20191014031432.15984-1-shenglei.zhang@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 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 --- v2: Add missing ')' which causes build failure. 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/IScsiDhcp.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) != '[')) { ConfigNvData->DnsMode = TRUE; - if (Field->Len > sizeof (ConfigNvData->TargetUrl)) { - return EFI_INVALID_PARAMETER; + if (Field->Len >= sizeof (ConfigNvData->TargetUrl)) { + Status = EFI_INVALID_PARAMETER; + goto ON_EXIT; } CopyMem (&ConfigNvData->TargetUrl, Field->Str, Field->Len); - ConfigNvData->TargetUrl[Field->Len + 1] = '\0'; + ConfigNvData->TargetUrl[Field->Len] = '\0'; } else { ConfigNvData->DnsMode = FALSE; ZeroMem(ConfigNvData->TargetUrl, sizeof (ConfigNvData->TargetUrl)); diff --git a/NetworkPkg/IScsiDxe/IScsiDhcp6.c b/NetworkPkg/IScsiDxe/IScsiDhcp6.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 >= sizeof (ConfigNvData->TargetUrl)) { + Status = EFI_INVALID_PARAMETER; + goto ON_EXIT; } CopyMem (&ConfigNvData->TargetUrl, Field->Str, Field->Len); - ConfigNvData->TargetUrl[Field->Len + 1] = '\0'; + ConfigNvData->TargetUrl[Field->Len] = '\0'; } else { ZeroMem(&ConfigNvData->TargetUrl, sizeof (ConfigNvData->TargetUrl)); Status = IScsiAsciiStrToIp (Field->Str, IpMode, &Ip); -- 2.18.0.windows.1