Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

check for invalid mailbox header length to avoid access violation #669

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

check for invalid mailbox header length to avoid access violation #669

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ef4d15
check for invalid mailbox header length
andre-comet Nov 29, 2022
984f7d5
Merge branch 'OpenEtherCATsociety:master' into fix-zero-mailbox-lengt…
andre-comet Dec 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion soem/ethercatcoe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,8 @@ int ecx_SDOread(ecx_contextt *context, uint16 slave, uint16 index, uint8 subinde
/* slave response should be CoE, SDO response */
if ((((aSDOp->MbxHeader.mbxtype & 0x0f) == ECT_MBXT_COE) &&
((etohs(aSDOp->CANOpen) >> 12) == ECT_COES_SDORES) &&
((aSDOp->Command & 0xe0) == 0x00)))
((aSDOp->Command & 0xe0) == 0x00) &&
(etohs(aSDOp->MbxHeader.length) >= 3)))
{
/* calculate mailbox transfer size */
Framedatasize = etohs(aSDOp->MbxHeader.length) - 3;
Expand Down