diff options
| author | Fu, Siyuan <siyuan.fu@intel.com> | 2014-08-08 00:41:14 +0000 |
|---|---|---|
| committer | sfu5 <sfu5@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-08-08 00:41:14 +0000 |
| commit | 2922e29ad86c1bb7b5e53e65eaf0098d866310d7 (patch) | |
| tree | 1b70b57abe76f6e40a7e86411e44b55a6c2b31ca | |
| parent | 8f9bafeea6adcd690d899a58db9c1dd1b048df38 (diff) | |
| download | edk2-2922e29ad86c1bb7b5e53e65eaf0098d866310d7.tar.gz edk2-2922e29ad86c1bb7b5e53e65eaf0098d866310d7.tar.bz2 edk2-2922e29ad86c1bb7b5e53e65eaf0098d866310d7.zip | |
Update network stack code to use StrnCpy instead of StrCpy.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu, Siyuan <siyuan.fu@intel.com>
Reviewed-By: Dong, Eric <eric.dong@intel.com>
Reviewed-by: Wu, Jiaxin <jiaxin.wu@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15773 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | NetworkPkg/Application/IfConfig6/IfConfig6.c | 6 | ||||
| -rw-r--r-- | NetworkPkg/Dhcp6Dxe/ComponentName.c | 4 | ||||
| -rw-r--r-- | NetworkPkg/IScsiDxe/IScsiMisc.c | 2 | ||||
| -rw-r--r-- | NetworkPkg/Ip6Dxe/Ip6ConfigNv.c | 8 | ||||
| -rw-r--r-- | NetworkPkg/IpSecDxe/Ikev2/Payload.c | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/NetworkPkg/Application/IfConfig6/IfConfig6.c b/NetworkPkg/Application/IfConfig6/IfConfig6.c index 36cc749933..9e228ca7bc 100644 --- a/NetworkPkg/Application/IfConfig6/IfConfig6.c +++ b/NetworkPkg/Application/IfConfig6/IfConfig6.c @@ -136,7 +136,7 @@ SplitStrToList ( //
Str = (CHAR16 *) AllocateZeroPool (StrSize (String));
ASSERT (Str != NULL);
- Str = StrCpy (Str, String);
+ Str = StrnCpy (Str, String, StrLen (String));
ArgStr = Str;
//
@@ -1720,7 +1720,7 @@ IfConfig6Initialize ( Str = (CHAR16 *) AllocateZeroPool (StrSize (ValueStr));
ASSERT (Str != NULL);
- Str = StrCpy (Str, ValueStr);
+ Str = StrnCpy (Str, ValueStr, StrLen (ValueStr));
Private->IfName = Str;
}
}
@@ -1734,7 +1734,7 @@ IfConfig6Initialize ( Str = (CHAR16 *) AllocateZeroPool (StrSize (ValueStr));
ASSERT (Str != NULL);
- Str = StrCpy (Str, ValueStr);
+ Str = StrnCpy (Str, ValueStr, StrLen (ValueStr));
Private->IfName = Str;
}
}
diff --git a/NetworkPkg/Dhcp6Dxe/ComponentName.c b/NetworkPkg/Dhcp6Dxe/ComponentName.c index 352df087f9..c7fd6075df 100644 --- a/NetworkPkg/Dhcp6Dxe/ComponentName.c +++ b/NetworkPkg/Dhcp6Dxe/ComponentName.c @@ -1,7 +1,7 @@ /** @file
UEFI Component Name(2) protocol implementation for Dhcp6 driver.
- Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -281,7 +281,7 @@ UpdateName ( if (Dhcp6ModeData.Ia == NULL) {
UnicodeSPrint (HandleName, sizeof (HandleName), L"DHCPv6 (No configured IA)");
} else {
- StrCpy (HandleName, mDhcp6ControllerName[Dhcp6ModeData.Ia->State]);
+ StrnCpy (HandleName, mDhcp6ControllerName[Dhcp6ModeData.Ia->State], sizeof (HandleName) / sizeof (CHAR16) - 1);
}
Status = AddUnicodeString2 (
diff --git a/NetworkPkg/IScsiDxe/IScsiMisc.c b/NetworkPkg/IScsiDxe/IScsiMisc.c index 444d6f062e..1968cc9370 100644 --- a/NetworkPkg/IScsiDxe/IScsiMisc.c +++ b/NetworkPkg/IScsiDxe/IScsiMisc.c @@ -209,7 +209,7 @@ IScsiLunToUnicodeStr ( for (Index = 0; Index < 4; Index++) {
if ((Lun[2 * Index] | Lun[2 * Index + 1]) == 0) {
- StrCpy (TempStr, L"0-");
+ StrnCpy (TempStr, L"0-", StrLen (L"0-"));
} else {
TempStr[0] = (CHAR16) IScsiHexString[Lun[2 * Index] >> 4];
TempStr[1] = (CHAR16) IScsiHexString[Lun[2 * Index] & 0x0F];
diff --git a/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c b/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c index 4716f797d4..19328e6e5e 100644 --- a/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c +++ b/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c @@ -718,9 +718,9 @@ Ip6ConvertInterfaceInfoToString ( // Print the interface type.
//
if (IfInfo->IfType == Ip6InterfaceTypeEthernet) {
- StrCpy (PortString, IP6_ETHERNET);
+ StrnCpy (PortString, IP6_ETHERNET, sizeof (PortString) / sizeof (CHAR16) - 1);
} else if (IfInfo->IfType == Ip6InterfaceTypeExperimentalEthernet) {
- StrCpy (PortString, IP6_EXPERIMENTAL_ETHERNET);
+ StrnCpy (PortString, IP6_EXPERIMENTAL_ETHERNET, sizeof (PortString) / sizeof (CHAR16) - 1);
} else {
//
// Refer to RFC1700, chapter Number Hardware Type.
@@ -747,9 +747,9 @@ Ip6ConvertInterfaceInfoToString ( for (Index = 0; Index < IfInfo->HwAddressSize; Index++) {
if (IfInfo->HwAddress.Addr[Index] < 0x10) {
- StrCpy (FormatString, L"0%x-");
+ StrnCpy (FormatString, L"0%x-", sizeof (FormatString) / sizeof (CHAR16) - 1);
} else {
- StrCpy (FormatString, L"%x-");
+ StrnCpy (FormatString, L"%x-", sizeof (FormatString) / sizeof (CHAR16) - 1);
}
Number = UnicodeSPrint (
diff --git a/NetworkPkg/IpSecDxe/Ikev2/Payload.c b/NetworkPkg/IpSecDxe/Ikev2/Payload.c index c1e134804c..6a2fdb83f3 100644 --- a/NetworkPkg/IpSecDxe/Ikev2/Payload.c +++ b/NetworkPkg/IpSecDxe/Ikev2/Payload.c @@ -1,7 +1,7 @@ /** @file
The implementation of Payloads Creation.
- Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -1393,7 +1393,7 @@ Ikev2ParserNotifyCookiePayload ( CopyMem (
IkeSaSession->NCookie,
- NotifyPayload + sizeof (IKEV2_NOTIFY),
+ (UINT8 *)NotifyPayload + sizeof (IKEV2_NOTIFY),
NotifyDataSize
);
|