pogmommy/nmrpflash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bail out after 5 unexpected NMRP packets

Browse source
This commit is contained in:
Joseph C. Lehner 2024-11-22 17:10:51 +01:00
parent a7310bf2dd
commit 273a16af16
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nmrp.c
View file

@ -400,6 +400,7 @@ int nmrp_do(struct nmrpd_args *args)
char *filename; char *filename;
time_t beg; time_t beg;
int i, timeout, status, ulreqs, expect, upload_ok, autoip, ka_reqs; int i, timeout, status, ulreqs, expect, upload_ok, autoip, ka_reqs;
unsigned unexpected;
bool was_plugged_in; bool was_plugged_in;
ssize_t bytes; ssize_t bytes;
struct ethsock *sock; struct ethsock *sock;
@ -631,6 +632,7 @@ int nmrp_do(struct nmrpd_args *args)
expect = NMRP_C_CONF_REQ; expect = NMRP_C_CONF_REQ;
ulreqs = 0; ulreqs = 0;
ka_reqs = 0; ka_reqs = 0;
unexpected = 0;
while (!g_interrupted) { while (!g_interrupted) {
if (expect != NMRP_C_NONE && rx.msg.code != expect) { if (expect != NMRP_C_NONE && rx.msg.code != expect) {
@ -640,6 +642,13 @@ int nmrp_do(struct nmrpd_args *args)
if (ulreqs && expect == NMRP_C_TFTP_UL_REQ && rx.msg.code == NMRP_C_CONF_REQ) { if (ulreqs && expect == NMRP_C_TFTP_UL_REQ && rx.msg.code == NMRP_C_CONF_REQ) {
args->maybe_invalid_firmware_file = true; args->maybe_invalid_firmware_file = true;
} }
if (++unexpected > 5) {
fprintf(stderr, "Bailing out.\n");
goto out;
}
} else {
unexpected = 0;
} }
msg_init(&tx.msg, NMRP_C_NONE); msg_init(&tx.msg, NMRP_C_NONE);