Mirrors_Framework/OpenPLC_v3
1
0
Fork 0
mirror of https://github.com/thiagoralves/OpenPLC_v3.git synced 2025-12-06 17:25:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Applied security fixes by Cisco Talos

Browse Source
This commit is contained in:
Autonomy Server
2024-09-17 12:09:29 -04:00
parent 3c08a69a65
commit df16a98db2
2 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
webserver/core/enip.cpp
View File

@@ -337,7 +337,7 @@ int sendRRData(int enipType, struct enip_header *header, struct enip_data_Unknow
//send pccc Data to pccc.cpp to be parsed and craft response
// returns the new PCCC data size
uint16_t newPcccSize = processPCCCMessage(pcccData, currentItem2Size - 13); // get length of new pccc size
if (newPcccSize == -1)
if (newPcccSize == (uint16_t) -1)
return -1; //error in PCCC.cpp
//item2_length is the length of the PCCC Data + 11 (11 for number of bytes after item2_length excluding PCCC Data)
@@ -480,7 +480,7 @@ int sendUnitData(struct enip_header *header, struct enip_data_Connected_0x70 *en
//send pccc Data to pccc.cpp to be parsed and craft response
// returns the new PCCC data size
uint16_t newPcccSize = processPCCCMessage(pcccData, currentPcccSize);
if (newPcccSize == -1)
if (newPcccSize == (uint16_t) -1)
return -1; //error in PCCC.cpp
//calculate Data Sizes
@@ -513,7 +513,8 @@ int sendUnitData(struct enip_header *header, struct enip_data_Connected_0x70 *en
int processEnipMessage(unsigned char *buffer, int buffer_size)
{
// initialize logging system
char log_msg[1000];
const int log_msg_max_size = 1000;
char log_msg[log_msg_max_size];
char *p = log_msg;
// initailize structs
@@ -583,16 +584,27 @@ int processEnipMessage(unsigned char *buffer, int buffer_size)
uint16_t size = sendUnitData(&header, &enipDataConnected_0x70);
return size; //sendUnitData()
}*/
else
{
p += sprintf(p, "Unknown EtherNet/IP request: ");
for (int i = 0; i < buffer_size; i++)
{
p += sprintf(p, "%02x ", (unsigned char)buffer[i]);
else
{
p = sprintf(p, "Unknown EtherNet/IP request: ");
int msg_size;
if (buffer_size < log_msg_max_size)
{
msg_size = buffer_size;
}
p += sprintf(p, "\n");
log(log_msg);
return -1;
}
else
{
// when the message buffer is larger than the log buffer, only print a subset
msg_size = 0x20;
}
for (int i = 0; i < msg_size; i++)
{
p += sprintf(p, "%02x ", (unsigned char)buffer[i]);
}
p += sprintf(p, "\n");
log(log_msg);
return -1;
}
}

12
webserver/core/pccc.cpp
View File

@@ -222,9 +222,9 @@ uint16_t Protected_Logical_Read_Reply(pccc_header header, unsigned char *buffer,
}//return length as -1 to signify that the CMD Code/Function Code was not recognize
/*Creating the reply packet and memcpy the data into the buffer*/
memmove(&buffer[0], (unsigned int)header.RP_CMD_Code, 1); //0x4f Response Code
memmove(&buffer[1], (unsigned int)header.HD_Status, 1); //Same from COMMAND REQUEST
memmove(&buffer[2], (unsigned int)header.HD_TransactionNum, 2);//Same from COMMAND REQUEST
memmove(&buffer[0], header.RP_CMD_Code, 1); //0x4f Response Code
memmove(&buffer[1], header.HD_Status, 1); //Same from COMMAND REQUEST
memmove(&buffer[2], header.HD_TransactionNum, 2);//Same from COMMAND REQUEST
return len_resp; //Return the Resonse Packet Length for PCCC
}
@@ -239,9 +239,9 @@ uint16_t Protected_Logical_Write_Reply(pccc_header header,unsigned char *buffer,
uint16_t len_resp = header.HD_length - 1;
/*Creating the reply packet and memcpy the data into the buffer*/
memmove(&buffer[0], (unsigned int)header.RP_CMD_Code, 1);
memmove(&buffer[1], (unsigned int)header.HD_Status, 1);
memmove(&buffer[2], (unsigned int)header.HD_TransactionNum, 2);
memmove(&buffer[0], header.RP_CMD_Code, 1);
memmove(&buffer[1], header.HD_Status, 1);
memmove(&buffer[2], header.HD_TransactionNum, 2);
/*check if the message is long enough- Left in for future error handling setup*/
/*if (buffer_size < 8)