faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cmdmon: reply to invalid commands

Browse source 
If an unknown command is received (e.g. from a future client), it should
get a reply and print an error code instead of timing out.
This commit is contained in:
Miroslav Lichvar 2016-01-29 15:32:47 +01:00
parent 7ba5ffa706
commit ea002130d7
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cmdmon.c
View file

@ -1253,14 +1253,7 @@ read_from_cmd_socket(void *anything)
return; return;
} }
/* Message size sanity check */ if (read_length < offsetof(CMD_Request, data) ||
if (read_length >= offsetof(CMD_Request, data)) {
expected_length = PKL_CommandLength(&rx_message);
} else {
expected_length = 0;
}
if (expected_length < offsetof(CMD_Request, data) ||
read_length < offsetof(CMD_Reply, data) || read_length < offsetof(CMD_Reply, data) ||
rx_message.pkt_type != PKT_TYPE_CMD_REQUEST || rx_message.pkt_type != PKT_TYPE_CMD_REQUEST ||
rx_message.res1 != 0 || rx_message.res1 != 0 ||
@ -1272,6 +1265,7 @@ read_from_cmd_socket(void *anything)
return; return;
} }
expected_length = PKL_CommandLength(&rx_message);
rx_command = ntohs(rx_message.command); rx_command = ntohs(rx_message.command);
tx_message.version = PROTO_VERSION_NUMBER; tx_message.version = PROTO_VERSION_NUMBER;
@ -1299,7 +1293,8 @@ read_from_cmd_socket(void *anything)
return; return;
} }
if (rx_command >= N_REQUEST_TYPES) { if (rx_command >= N_REQUEST_TYPES ||
expected_length < (int)offsetof(CMD_Request, data)) {
DEBUG_LOG(LOGF_CmdMon, "Command packet has invalid command %d", rx_command); DEBUG_LOG(LOGF_CmdMon, "Command packet has invalid command %d", rx_command);
tx_message.status = htons(STT_INVALID); tx_message.status = htons(STT_INVALID);