eive/eive-obsw
eive/eive-obsw
12
3
Fork 0
Code Issues 3 Pull Requests Releases 118 Wiki Activity

small update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2022-08-24 15:16:46 +02:00
parent 3c23ede9dd
commit 6d53a38f9f
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
linux/devices/ploc/PlocSupervisorHandler.cpp
View File

@ -1994,7 +1994,8 @@ ReturnValue_t PlocSupervisorHandler::extractUpdateCommand(const uint8_t* command
supv::UpdateParams& params) { supv::UpdateParams& params) {
size_t remSize = size; size_t remSize = size;
if (size > (config::MAX_FILENAME_SIZE + config::MAX_PATH_SIZE + sizeof(params.memId)) + if (size > (config::MAX_FILENAME_SIZE + config::MAX_PATH_SIZE + sizeof(params.memId)) +
sizeof(params.startAddr) + sizeof(params.bytesWritten) + sizeof(params.seqCount)) { sizeof(params.startAddr) + sizeof(params.bytesWritten) + sizeof(params.seqCount) +
sizeof(uint8_t)) {
sif::warning << "PlocSupervisorHandler::extractUpdateCommand: Data size too big" << std::endl; sif::warning << "PlocSupervisorHandler::extractUpdateCommand: Data size too big" << std::endl;
return SupvReturnValuesIF::INVALID_LENGTH; return SupvReturnValuesIF::INVALID_LENGTH;
} }
@ -2016,14 +2017,17 @@ ReturnValue_t PlocSupervisorHandler::extractUpdateCommand(const uint8_t* command
<< std::endl; << std::endl;
return result; return result;
} }
result = SerializeAdapter::deSerialize(&params.deleteMemory, &commandData, &remSize, uint8_t delMemRaw = 0;
SerializeIF::Endianness::BIG); result = SerializeAdapter::deSerialize(&delMemRaw, &commandData, &remSize,
SerializeIF::Endianness::BIG);
if (result != RETURN_OK) { if (result != RETURN_OK) {
sif::warning sif::warning
<< "PlocSupervisorHandler::extractUpdateCommand: Failed to deserialize whether to delete " << "PlocSupervisorHandler::extractUpdateCommand: Failed to deserialize whether to delete "
"memory" << std::endl; "memory"
<< std::endl;
return result; return result;
} }
params.deleteMemory = delMemRaw;
return RETURN_OK; return RETURN_OK;
} }

2
linux/devices/ploc/PlocSupvHelper.cpp
View File

@ -253,7 +253,7 @@ ReturnValue_t PlocSupvHelper::executeUpdate() {
if (result != RETURN_OK) { if (result != RETURN_OK) {
return result; return result;
} }
if(update.deleteMemory) { if (update.deleteMemory) {
sif::info << "PLOC SUPV Update MPSoC: Erasing Memory" << std::endl; sif::info << "PLOC SUPV Update MPSoC: Erasing Memory" << std::endl;
result = eraseMemory(); result = eraseMemory();
if (result != RETURN_OK) { if (result != RETURN_OK) {