diff options
| author | Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu> | 2024-12-28 13:46:27 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-12-28 11:59:42 -0600 |
| commit | 77da29b8687006bc7b706d3fb73f720392d236a5 (patch) | |
| tree | 475e878c11cd6a4d1f93f27a62ed26cb5e7ea5e3 /net/tcp.c | |
| parent | d580a013cca67a8115fb88d260498bde181709a1 (diff) | |
net/tcp: fix TCP options processing
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>
Diffstat (limited to 'net/tcp.c')
| -rw-r--r-- | net/tcp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/tcp.c b/net/tcp.c index b0cc8a1fe3e..3e3118de450 100644 --- a/net/tcp.c +++ b/net/tcp.c @@ -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]; } } |