bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check phy_request length for read operations, too!

This commit is contained in:
Florian Pose 2009-04-08 11:48:00 +00:00
parent 0bedfe5ef8
commit 9483b8e1ae
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
master/fsm_master.c
View File

@ -353,6 +353,16 @@ int ec_fsm_master_action_process_phy(
"offset 0x%04x, length %u...\n",
request->slave->ring_position,
request->offset, request->length);
if (request->length > fsm->datagram->mem_size) {
EC_ERR("Request length (%u) exceeds maximum "
"datagram size (%u)!\n", request->length,
fsm->datagram->mem_size);
request->state = EC_INT_REQUEST_FAILURE;
wake_up(&master->phy_queue);
continue;
}
fsm->phy_request = request;
if (request->dir == EC_DIR_INPUT) {
@ -360,14 +370,6 @@ int ec_fsm_master_action_process_phy(
request->offset, request->length);
ec_datagram_zero(fsm->datagram);
} else {
if (request->length > fsm->datagram->mem_size) {
EC_ERR("Request length (%u) exceeds maximum "
"datagram size (%u)!\n", request->length,
fsm->datagram->mem_size);
request->state = EC_INT_REQUEST_FAILURE;
wake_up(&master->phy_queue);
continue;
}
ec_datagram_fpwr(fsm->datagram, request->slave->station_address,
request->offset, request->length);
memcpy(fsm->datagram->data, request->data, request->length);