gitproxy/RTLPlayground
1
0
Fork 0
mirror of https://github.com/logicog/RTLPlayground.git synced 2026-08-30 14:52:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

stp: reject port sub-commands with a missing argument

Browse Source 
"stp port 7 edge" (no value) passed the cmd_words_len < 4 check and then
cmd_compare(4, ...) read a stale word left over from the PREVIOUS command
line - cmd_words_b is not cleared between commands - so the sub-command
could randomly match whatever was typed before. Require 5 words for every
per-port sub-command that carries an argument (everything except on/off).

(cherry picked from commit 1210f4f9257b14c31ad653fc7616ef403a494d28)
This commit is contained in:
d00f
2026-08-04 03:25:10 +02:00
parent 531bbbea5d
commit bce1d2bd28
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rtl837x_stp.c
+5
View File
@@ -524,6 +524,11 @@ void stp_parse(void) __banked __reentrant
goto err; goto err;
{ {
uint8_t port = machine.phys_to_log_port[stp_scratch - 1]; uint8_t port = machine.phys_to_log_port[stp_scratch - 1];
/* every sub-command except on/off carries one more argument; without
* this check cmd_compare(4,..) would read a stale word from the
* PREVIOUS command line (cmd_words_b is not cleared between commands) */
if (cmd_words_len < 5 && !cmd_compare(3, "on") && !cmd_compare(3, "off"))
goto err;
if (cmd_compare(3, "on")) { if (cmd_compare(3, "on")) {
stp_pflags[port] |= STP_PF_ENABLED; stp_pflags[port] |= STP_PF_ENABLED;
stp_pflags[port] &= ~STP_PF_TRIPPED; stp_pflags[port] &= ~STP_PF_TRIPPED;