chao
/
linuxptp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

send errors if mgmt tlv length doesn't match action 

It's especially important to check that SET messages aren't empty.

Signed-off-by: Geoff Salmon <gsalmon@se-instruments.com>
master
Geoff Salmon 2013-02-06 11:24:35 -05:00 committed by Richard Cochran
parent 3921557672
commit f8be779f28
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
clock.c
View File

@ -645,16 +645,34 @@ void clock_manage(struct clock *c, struct port *p, struct ptp_message *msg)
} }
mgt = (struct management_tlv *) msg->management.suffix; mgt = (struct management_tlv *) msg->management.suffix;
/*
The correct length according to the management ID is checked
in tlv.c, but management TLVs with empty bodies are also
received successfully to support GETs and CMDs. At this
point the TLV either has the correct length or length 2.
*/
switch (management_action(msg)) { switch (management_action(msg)) {
case GET: case GET:
if (mgt->length != 2) {
clock_management_send_error(p, msg, WRONG_LENGTH);
return;
}
if (clock_management_get_response(c, p, mgt->id, msg)) if (clock_management_get_response(c, p, mgt->id, msg))
return; return;
break; break;
case SET: case SET:
if (mgt->length == 2 && mgt->id != NULL_MANAGEMENT) {
clock_management_send_error(p, msg, WRONG_LENGTH);
return;
}
if (clock_management_set(c, p, mgt->id, msg)) if (clock_management_set(c, p, mgt->id, msg))
return; return;
break; break;
case COMMAND: case COMMAND:
if (mgt->length != 2) {
clock_management_send_error(p, msg, WRONG_LENGTH);
return;
}
break; break;
default: default:
return; return;