colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net/tcp: fix TCP options processing

Browse Source 
Current TCP code may miss an option if TCP_O_NOP option was used before
it for proper aligning.

Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Mikhail Kshevetskiy
2024-12-28 13:46:27 +03:00
committed by Tom Rini
parent d580a013cc
commit 77da29b868
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/tcp.c
View File

@@ -475,7 +475,7 @@ void tcp_parse_options(uchar *o, int o_len)
* NOPs are options with a zero length, and thus are special.
* All other options have length fields.
*/
for (p = o; p < (o + o_len); p = p + p[1]) {
for (p = o; p < (o + o_len); ) {
if (!p[1])
return; /* Finished processing options */
@@ -490,12 +490,14 @@ void tcp_parse_options(uchar *o, int o_len)
case TCP_O_TS:
tsopt = (struct tcp_t_opt *)p;
rmt_timestamp = tsopt->t_snd;
return;
break;
}
/* Process optional NOPs */
if (p[0] == TCP_O_NOP)
p++;
else
p += p[1];
}
}