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.

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

session cookie/ID check #100

Merged
merged 1 commit into from
Jan 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 0 deletions plc/Attributes1.c
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,9 @@ signed Attributes1 (struct plc * plc)
};
char string [512];
size_t length = 0;
if (confirm->COOKIE != HTOLE32 (plc->cookie)) {
continue;
}
if (confirm->MSTATUS)
{
Failure (plc, PLC_WONTDOIT);
Expand Down
3 changes: 3 additions & 0 deletions plc/Attributes2.c
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,9 @@ signed Attributes2 (struct plc * plc)

char string [512];
size_t length = 0;
if (confirm->COOKIE != HTOLE32 (plc->cookie)) {
continue;
}
if (confirm->MSTATUS)
{
Failure (plc, PLC_WONTDOIT);
Expand Down
3 changes: 3 additions & 0 deletions plc/GetProperty.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,9 @@ signed GetProperty (struct plc * plc, struct plcproperty * plcproperty)
}
while (ReadMME (plc, 0, (VS_GET_PROPERTY | MMTYPE_CNF)) > 0)
{
if (confirm->COOKIE != HTOLE32 (plc->cookie)) {
continue;
}
if (confirm->MSTATUS)
{
Failure (plc, PLC_WONTDOIT);
Expand Down
17 changes: 10 additions & 7 deletions plc/ModuleCommit.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ signed ModuleCommit (struct plc * plc, uint32_t options)
uint32_t COMMIT_CODE;
uint8_t NUM_MODULES;
}
request;
confirm;
struct __packed
{
uint16_t MOD_STATUS;
Expand Down Expand Up @@ -132,12 +132,15 @@ signed ModuleCommit (struct plc * plc, uint32_t options)
return (-1);
}
channel->timeout = PLC_MODULE_WRITE_TIMEOUT;
if (ReadMME (plc, 0, (VS_MODULE_OPERATION | MMTYPE_CNF)) <= 0)
{
error (PLC_EXIT (plc), errno, CHANNEL_CANTREAD);
channel->timeout = timer;
return (-1);
}
do {
if (ReadMME (plc, 0, (VS_MODULE_OPERATION | MMTYPE_CNF)) <= 0)
{
error (PLC_EXIT (plc), errno, CHANNEL_CANTREAD);
channel->timeout = timer;
return (-1);
}
} while (confirm->confirm.MOD_OP != HTOLE16 (PLC_MOD_OP_CLOSE_SESSION) ||
confirm->confirm.MOD_OP_SESSION_ID != HTOLE32 (plc->cookie));
channel->timeout = timer;
if (confirm->MSTATUS)
{
Expand Down
15 changes: 9 additions & 6 deletions plc/ModuleSession.c
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,15 @@ signed ModuleSession (struct plc * plc, unsigned modules, struct vs_module_spec
return (-1);
}
channel->timeout = PLC_MODULE_REQUEST_TIMEOUT;
if (ReadMME (plc, 0, (VS_MODULE_OPERATION | MMTYPE_CNF)) <= 0)
{
error (PLC_EXIT (plc), errno, CHANNEL_CANTREAD);
channel->timeout = timer;
return (-1);
}
do {
if (ReadMME (plc, 0, (VS_MODULE_OPERATION | MMTYPE_CNF)) <= 0)
{
error (PLC_EXIT (plc), errno, CHANNEL_CANTREAD);
channel->timeout = timer;
return (-1);
}
} while (confirm->MODULE_SPEC.MOD_OP != HTOLE16 (PLC_MOD_OP_START_SESSION) ||
confirm->MODULE_SPEC.MOD_OP_SESSION_ID != HTOLE32 (plc->cookie));
channel->timeout = timer;
if (confirm->MSTATUS)
{
Expand Down
15 changes: 9 additions & 6 deletions plc/ModuleWrite.c
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,15 @@ signed ModuleWrite (struct plc * plc, struct _file_ * file, unsigned index, stru
return (-1);
}
channel->timeout = PLC_MODULE_WRITE_TIMEOUT;
if (ReadMME (plc, 0, (VS_MODULE_OPERATION | MMTYPE_CNF)) <= 0)
{
error (PLC_EXIT (plc), errno, CHANNEL_CANTREAD);
channel->timeout = timer;
return (-1);
}
do {
if (ReadMME (plc, 0, (VS_MODULE_OPERATION | MMTYPE_CNF)) <= 0)
{
error (PLC_EXIT (plc), errno, CHANNEL_CANTREAD);
channel->timeout = timer;
return (-1);
}
} while (confirm->MODULE_SPEC.MOD_OP != HTOLE16 (PLC_MOD_OP_WRITE_MODULE) ||
confirm->MODULE_SPEC.MOD_OP_SESSION_ID != HTOLE32 (plc->cookie));
channel->timeout = timer;

#if 1
Expand Down
3 changes: 3 additions & 0 deletions plc/SetProperty.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ signed SetProperty (struct plc * plc, struct plcproperty * plcproperty)
}
while (ReadMME (plc, 0, (VS_SET_PROPERTY | MMTYPE_CNF)) > 0)
{
if (confirm->COOKIE != HTOLE32 (plc->cookie)) {
continue;
}
if (confirm->MSTATUS)
{
Failure (plc, PLC_WONTDOIT);
Expand Down
4 changes: 4 additions & 0 deletions plc/VersionInfo2.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@ signed VersionInfo2 (struct plc * plc)

#endif

/* firmware doesn't fill confirm->COOKIE field at (confirm->MVERSION + confirm->MVERLENGTH + 9)
* (and IDENT, STEPPING_NUM) properly, so we don't check it.
*/

if (confirm->MSTATUS)
{
Failure (plc, PLC_WONTDOIT);
Expand Down
14 changes: 8 additions & 6 deletions plc/WatchdogReport.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ signed WatchdogReport (struct plc * plc)
memset (message, 0, sizeof (* message));
EthernetHeader (&request->ethernet, channel->peer, channel->host, channel->type);
QualcommHeader (&request->qualcomm, 0, (VS_WD_RPT | MMTYPE_REQ));
request->SESSIONID = HTOLE32 (plc->cookie);
request->SESSIONID = HTOLE16 (plc->cookie);
request->CLR = plc->readaction;
plc->packetsize = (ETHER_MIN_LEN - ETHER_CRC_LEN);
if (SendMME (plc) <= 0)
Expand All @@ -122,11 +122,13 @@ signed WatchdogReport (struct plc * plc)
}
do
{
if (ReadMME (plc, 0, (VS_WD_RPT | MMTYPE_IND)) <= 0)
{
error (PLC_EXIT (plc), errno, CHANNEL_CANTREAD);
return (-1);
}
do {
if (ReadMME (plc, 0, (VS_WD_RPT | MMTYPE_IND)) <= 0)
{
error (PLC_EXIT (plc), errno, CHANNEL_CANTREAD);
return (-1);
}
} while (indicate->SESSIONID != HTOLE16 (plc->cookie));
if (indicate->MSTATUS)
{
Failure (plc, PLC_WONTDOIT);
Expand Down
12 changes: 7 additions & 5 deletions plc/WriteExecuteApplet2.c
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,13 @@ signed WriteExecuteApplet2 (struct plc * plc, unsigned module, const struct nvm_
error (PLC_EXIT (plc), errno, CHANNEL_CANTSEND);
return (-1);
}
if (ReadMME (plc, 0, (VS_WRITE_AND_EXECUTE_APPLET | MMTYPE_CNF)) <= 0)
{
error (PLC_EXIT (plc), errno, CHANNEL_CANTREAD);
return (-1);
}
do {
if (ReadMME (plc, 0, (VS_WRITE_AND_EXECUTE_APPLET | MMTYPE_CNF)) <= 0)
{
error (PLC_EXIT (plc), errno, CHANNEL_CANTREAD);
return (-1);
}
} while (confirm->CLIENT_SESSION_ID != HTOLE32 (plc->cookie));
if (confirm->MSTATUS)
{
Failure (plc, PLC_WONTDOIT);
Expand Down
12 changes: 7 additions & 5 deletions plc/WriteExecuteFirmware1.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,13 @@ signed WriteExecuteFirmware1 (struct plc * plc, unsigned module, const struct nv
error (PLC_EXIT (plc), errno, CHANNEL_CANTSEND);
return (-1);
}
if (ReadMME (plc, 0, (VS_WRITE_AND_EXECUTE_APPLET | MMTYPE_CNF)) <= 0)
{
error (PLC_EXIT (plc), errno, CHANNEL_CANTREAD);
return (-1);
}
do {
if (ReadMME (plc, 0, (VS_WRITE_AND_EXECUTE_APPLET | MMTYPE_CNF)) <= 0)
{
error (PLC_EXIT (plc), errno, CHANNEL_CANTREAD);
return (-1);
}
} while (confirm->CLIENT_SESSION_ID != HTOLE32 (plc->cookie));
if (confirm->MSTATUS)
{
Failure (plc, PLC_WONTDOIT);
Expand Down
12 changes: 7 additions & 5 deletions plc/WriteExecuteFirmware2.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,13 @@ signed WriteExecuteFirmware2 (struct plc * plc, unsigned module, const struct nv
error (PLC_EXIT (plc), errno, CHANNEL_CANTSEND);
return (-1);
}
if (ReadMME (plc, 0, (VS_WRITE_AND_EXECUTE_APPLET | MMTYPE_CNF)) <= 0)
{
error (PLC_EXIT (plc), errno, CHANNEL_CANTREAD);
return (-1);
}
do {
if (ReadMME (plc, 0, (VS_WRITE_AND_EXECUTE_APPLET | MMTYPE_CNF)) <= 0)
{
error (PLC_EXIT (plc), errno, CHANNEL_CANTREAD);
return (-1);
}
} while (confirm->CLIENT_SESSION_ID != HTOLE32 (plc->cookie));
if (confirm->MSTATUS)
{
Failure (plc, PLC_WONTDOIT);
Expand Down
12 changes: 7 additions & 5 deletions plc/WriteExecutePIB.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,13 @@ signed WriteExecutePIB (struct plc * plc, uint32_t offset, struct pib_header * h
error (PLC_EXIT (plc), errno, CHANNEL_CANTSEND);
return (-1);
}
if (ReadMME (plc, 0, (VS_WRITE_AND_EXECUTE_APPLET | MMTYPE_CNF)) <= 0)
{
error (PLC_EXIT (plc), errno, CHANNEL_CANTREAD);
return (-1);
}
do {
if (ReadMME (plc, 0, (VS_WRITE_AND_EXECUTE_APPLET | MMTYPE_CNF)) <= 0)
{
error (PLC_EXIT (plc), errno, CHANNEL_CANTREAD);
return (-1);
}
} while (confirm->CLIENT_SESSION_ID != HTOLE32 (plc->cookie));
if (confirm->MSTATUS)
{
Failure (plc, PLC_WONTDOIT);
Expand Down
12 changes: 7 additions & 5 deletions plc/WriteExecuteParameters1.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,13 @@ signed WriteExecuteParameters1 (struct plc * plc, unsigned module, const struct
error (PLC_EXIT (plc), errno, CHANNEL_CANTSEND);
return (-1);
}
if (ReadMME (plc, 0, (VS_WRITE_AND_EXECUTE_APPLET | MMTYPE_CNF)) <= 0)
{
error (PLC_EXIT (plc), errno, CHANNEL_CANTREAD);
return (-1);
}
do {
if (ReadMME (plc, 0, (VS_WRITE_AND_EXECUTE_APPLET | MMTYPE_CNF)) <= 0)
{
error (PLC_EXIT (plc), errno, CHANNEL_CANTREAD);
return (-1);
}
} while (confirm->CLIENT_SESSION_ID != HTOLE32 (plc->cookie));
if (confirm->MSTATUS)
{
Failure (plc, PLC_WONTDOIT);
Expand Down
12 changes: 7 additions & 5 deletions plc/WriteExecuteParameters2.c
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,13 @@ signed WriteExecuteParameters2 (struct plc * plc, unsigned module, const struct
error (PLC_EXIT (plc), errno, CHANNEL_CANTSEND);
return (-1);
}
if (ReadMME (plc, 0, (VS_WRITE_AND_EXECUTE_APPLET | MMTYPE_CNF)) <= 0)
{
error (PLC_EXIT (plc), errno, CHANNEL_CANTREAD);
return (-1);
}
do {
if (ReadMME (plc, 0, (VS_WRITE_AND_EXECUTE_APPLET | MMTYPE_CNF)) <= 0)
{
error (PLC_EXIT (plc), errno, CHANNEL_CANTREAD);
return (-1);
}
} while (confirm->CLIENT_SESSION_ID != HTOLE32 (plc->cookie));
if (confirm->MSTATUS)
{
Failure (plc, PLC_WONTDOIT);
Expand Down