mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tcp, flow: Fix some error paths which didn't clean up flows properly

Browse source 
Flow table entries need to be fully initialised before returning to the
main epoll loop.  Commit 0060acd1 ("flow: Clarify and enforce flow state
transitions") now enforces that: once a flow is allocated we must either
cancel it, or activate it before returning to the main loop, or we will hit
an ASSERT().

Some error paths in tcp_conn_from_tap() weren't correctly updated for this
requirement - we can exit with a flow entry incompletely initialised.
Correct that by cancelling the flows in those situations.

I don't have enough information to be certain if this is the cause for
podman bug 22925, but it plausibly could be.

Fixes: 0060acd11b ("flow: Clarify and enforce flow state transitions")
Link: https://github.com/containers/podman/issues/22925
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
David Gibson 2024-06-07 11:55:24 +10:00 committed by Stefano Brivio
parent 3f63743a65
commit ec416fdcc4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tcp.c
View file

@ -2067,7 +2067,7 @@ static void tcp_conn_from_tap(struct ctx *c, sa_family_t af,
if (!bind(s, sa, sl)) { if (!bind(s, sa, sl)) {
tcp_rst(c, conn); /* Nobody is listening then */ tcp_rst(c, conn); /* Nobody is listening then */
return; goto cancel;
} }
if (errno != EADDRNOTAVAIL && errno != EACCES) if (errno != EADDRNOTAVAIL && errno != EACCES)
conn_flag(c, conn, LOCAL); conn_flag(c, conn, LOCAL);
@ -2080,7 +2080,7 @@ static void tcp_conn_from_tap(struct ctx *c, sa_family_t af,
if (connect(s, sa, sl)) { if (connect(s, sa, sl)) {
if (errno != EINPROGRESS) { if (errno != EINPROGRESS) {
tcp_rst(c, conn); tcp_rst(c, conn);
return; goto cancel;
} }
tcp_get_sndbuf(conn); tcp_get_sndbuf(conn);
@ -2088,7 +2088,7 @@ static void tcp_conn_from_tap(struct ctx *c, sa_family_t af,
tcp_get_sndbuf(conn); tcp_get_sndbuf(conn);
if (tcp_send_flag(c, conn, SYN | ACK)) if (tcp_send_flag(c, conn, SYN | ACK))
return; goto cancel;
conn_event(c, conn, TAP_SYN_ACK_SENT); conn_event(c, conn, TAP_SYN_ACK_SENT);
} }