tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-30 17:14:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Append the terminating null character at the end of the string to avoid buffer overflow.

Browse Source 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qiu Shumin <shumin.qiu@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15888 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Qiu Shumin 2014-08-25 08:04:52 +00:00 committed by shenshushi
parent b69fd59e6f
commit a361d39160
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c
View File

@ -60,7 +60,8 @@ PxeBcCheckPacket (
if (Packet->OpCode == EFI_MTFTP4_OPCODE_ERROR) { if (Packet->OpCode == EFI_MTFTP4_OPCODE_ERROR) {
Private->Mode.TftpErrorReceived = TRUE; Private->Mode.TftpErrorReceived = TRUE;
Private->Mode.TftpError.ErrorCode = (UINT8) Packet->Error.ErrorCode; Private->Mode.TftpError.ErrorCode = (UINT8) Packet->Error.ErrorCode;
AsciiStrnCpy (Private->Mode.TftpError.ErrorString, (CHAR8 *) Packet->Error.ErrorMessage, 127); AsciiStrnCpy (Private->Mode.TftpError.ErrorString, (CHAR8 *) Packet->Error.ErrorMessage, PXE_MTFTP_ERROR_STRING_LENGTH);
Private->Mode.TftpError.ErrorString[PXE_MTFTP_ERROR_STRING_LENGTH - 1] = '\0';
} }
if (Callback != NULL) { if (Callback != NULL) {
@ -162,8 +163,9 @@ PxeBcTftpGetFileSize (
AsciiStrnCpy ( AsciiStrnCpy (
Private->Mode.TftpError.ErrorString, Private->Mode.TftpError.ErrorString,
(CHAR8 *) Packet->Error.ErrorMessage, (CHAR8 *) Packet->Error.ErrorMessage,
127 PXE_MTFTP_ERROR_STRING_LENGTH
); );
Private->Mode.TftpError.ErrorString[PXE_MTFTP_ERROR_STRING_LENGTH - 1] = '\0';
} }
goto ON_ERROR; goto ON_ERROR;
} }

4
MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h
View File

@ -1,7 +1,7 @@
/** @file /** @file
Mtftp routines for PxeBc. Mtftp routines for PxeBc.
Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved.<BR> Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -21,6 +21,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#define PXE_MTFTP_OPTION_MULTICAST_INDEX 3 #define PXE_MTFTP_OPTION_MULTICAST_INDEX 3
#define PXE_MTFTP_OPTION_MAXIMUM_INDEX 4 #define PXE_MTFTP_OPTION_MAXIMUM_INDEX 4
#define PXE_MTFTP_ERROR_STRING_LENGTH 127
/** /**
This function is to get size of a file by Tftp. This function is to get size of a file by Tftp.

3
NetworkPkg/Application/IpsecConfig/Indexer.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
The implementation of construct ENTRY_INDEXER in IpSecConfig application. The implementation of construct ENTRY_INDEXER in IpSecConfig application.
Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
@ -234,6 +234,7 @@ ConstructPadIndexer (
} }
Indexer->PadId.PeerIdValid = TRUE; Indexer->PadId.PeerIdValid = TRUE;
ZeroMem (Indexer->PadId.Id.PeerId, MAX_PEERID_LEN);
StrnCpy ((CHAR16 *) Indexer->PadId.Id.PeerId, ValueStr, ARRAY_SIZE (Indexer->PadId.Id.PeerId) - 1); StrnCpy ((CHAR16 *) Indexer->PadId.Id.PeerId, ValueStr, ARRAY_SIZE (Indexer->PadId.Id.PeerId) - 1);
} }
} }

4
NetworkPkg/UefiPxeBcDxe/PxeBcMtftp.c
View File

@ -69,6 +69,7 @@ PxeBcMtftp6CheckPacket (
(CHAR8 *) Packet->Error.ErrorMessage, (CHAR8 *) Packet->Error.ErrorMessage,
PXE_MTFTP_ERROR_STRING_LENGTH PXE_MTFTP_ERROR_STRING_LENGTH
); );
Private->Mode.TftpError.ErrorString[PXE_MTFTP_ERROR_STRING_LENGTH - 1] = '\0';
} }
if (Callback != NULL) { if (Callback != NULL) {
@ -182,6 +183,7 @@ PxeBcMtftp6GetFileSize (
(CHAR8 *) Packet->Error.ErrorMessage, (CHAR8 *) Packet->Error.ErrorMessage,
PXE_MTFTP_ERROR_STRING_LENGTH PXE_MTFTP_ERROR_STRING_LENGTH
); );
Private->Mode.TftpError.ErrorString[PXE_MTFTP_ERROR_STRING_LENGTH - 1] = '\0';
} }
goto ON_ERROR; goto ON_ERROR;
} }
@ -511,6 +513,7 @@ PxeBcMtftp4CheckPacket (
(CHAR8 *) Packet->Error.ErrorMessage, (CHAR8 *) Packet->Error.ErrorMessage,
PXE_MTFTP_ERROR_STRING_LENGTH PXE_MTFTP_ERROR_STRING_LENGTH
); );
Private->Mode.TftpError.ErrorString[PXE_MTFTP_ERROR_STRING_LENGTH - 1] = '\0';
} }
if (Callback != NULL) { if (Callback != NULL) {
@ -624,6 +627,7 @@ PxeBcMtftp4GetFileSize (
(CHAR8 *) Packet->Error.ErrorMessage, (CHAR8 *) Packet->Error.ErrorMessage,
PXE_MTFTP_ERROR_STRING_LENGTH PXE_MTFTP_ERROR_STRING_LENGTH
); );
Private->Mode.TftpError.ErrorString[PXE_MTFTP_ERROR_STRING_LENGTH - 1] = '\0';
} }
goto ON_ERROR; goto ON_ERROR;
} }