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

tcp: Pass union tcp_conn pointer to destroy and splice timer functions

Browse source 
The pointers are actually the same, but we later pass the container
union to tcp_table_compact(), which might zero the size of the whole
union, and this confuses Coverity Scan.

Given that we have pointers to the container union to start with,
just pass those instead, all the way down to tcp_table_compact().

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Stefano Brivio 2022-11-19 09:29:54 +01:00
parent 8e914238b6
commit b06014a6b2
3 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tcp.c
View file

@ -1372,16 +1372,18 @@ void tcp_table_compact(struct ctx *c, union tcp_conn *hole)
/** /**
* tcp_conn_destroy() - Close sockets, trigger hash table removal and compaction * tcp_conn_destroy() - Close sockets, trigger hash table removal and compaction
* @c: Execution context * @c: Execution context
* @conn: Connection pointer * @conn_union: Connection pointer (container union)
*/ */
static void tcp_conn_destroy(struct ctx *c, struct tcp_tap_conn *conn) static void tcp_conn_destroy(struct ctx *c, union tcp_conn *conn_union)
{ {
struct tcp_tap_conn *conn = &conn_union->tap;
close(conn->sock); close(conn->sock);
if (conn->timer != -1) if (conn->timer != -1)
close(conn->timer); close(conn->timer);
tcp_hash_remove(c, conn); tcp_hash_remove(c, conn);
tcp_table_compact(c, (union tcp_conn *)conn); tcp_table_compact(c, conn_union);
} }
static void tcp_rst_do(struct ctx *c, struct tcp_tap_conn *conn); static void tcp_rst_do(struct ctx *c, struct tcp_tap_conn *conn);
@ -1531,13 +1533,12 @@ void tcp_defer_handler(struct ctx *c)
for (conn = tc + c->tcp.conn_count - 1; conn >= tc; conn--) { for (conn = tc + c->tcp.conn_count - 1; conn >= tc; conn--) {
if (conn->c.spliced) { if (conn->c.spliced) {
if (conn->splice.flags & CLOSING) if (conn->splice.flags & CLOSING)
tcp_splice_destroy(c, &conn->splice); tcp_splice_destroy(c, conn);
} else { } else {
if (conn->tap.events == CLOSED) if (conn->tap.events == CLOSED)
tcp_conn_destroy(c, &conn->tap); tcp_conn_destroy(c, conn);
} }
} }
} }
/** /**
@ -3391,10 +3392,10 @@ void tcp_timer(struct ctx *c, const struct timespec *ts)
for (conn = tc + c->tcp.conn_count - 1; conn >= tc; conn--) { for (conn = tc + c->tcp.conn_count - 1; conn >= tc; conn--) {
if (conn->c.spliced) { if (conn->c.spliced) {
tcp_splice_timer(c, &conn->splice); tcp_splice_timer(c, conn);
} else { } else {
if (conn->tap.events == CLOSED) if (conn->tap.events == CLOSED)
tcp_conn_destroy(c, &conn->tap); tcp_conn_destroy(c, conn);
} }
} }

4
tcp_conn.h
View file

@ -184,8 +184,8 @@ extern union tcp_conn tc[];
void tcp_splice_conn_update(struct ctx *c, struct tcp_splice_conn *new); void tcp_splice_conn_update(struct ctx *c, struct tcp_splice_conn *new);
void tcp_table_compact(struct ctx *c, union tcp_conn *hole); void tcp_table_compact(struct ctx *c, union tcp_conn *hole);
void tcp_splice_destroy(struct ctx *c, struct tcp_splice_conn *conn); void tcp_splice_destroy(struct ctx *c, union tcp_conn *conn_union);
void tcp_splice_timer(struct ctx *c, struct tcp_splice_conn *conn); void tcp_splice_timer(struct ctx *c, union tcp_conn *conn_union);
void tcp_splice_pipe_refill(const struct ctx *c); void tcp_splice_pipe_refill(const struct ctx *c);

16
tcp_splice.c
View file

@ -251,10 +251,12 @@ void tcp_splice_conn_update(struct ctx *c, struct tcp_splice_conn *new)
/** /**
* tcp_splice_destroy() - Close spliced connection and pipes, clear * tcp_splice_destroy() - Close spliced connection and pipes, clear
* @c: Execution context * @c: Execution context
* @conn: Connection pointer * @conn_union: Spliced connection (container union)
*/ */
void tcp_splice_destroy(struct ctx *c, struct tcp_splice_conn *conn) void tcp_splice_destroy(struct ctx *c, union tcp_conn *conn_union)
{ {
struct tcp_splice_conn *conn = &conn_union->splice;
if (conn->events & SPLICE_ESTABLISHED) { if (conn->events & SPLICE_ESTABLISHED) {
/* Flushing might need to block: don't recycle them. */ /* Flushing might need to block: don't recycle them. */
if (conn->pipe_a_b[0] != -1) { if (conn->pipe_a_b[0] != -1) {
@ -283,7 +285,7 @@ void tcp_splice_destroy(struct ctx *c, struct tcp_splice_conn *conn)
debug("TCP (spliced): index %li, CLOSED", CONN_IDX(conn)); debug("TCP (spliced): index %li, CLOSED", CONN_IDX(conn));
c->tcp.splice_conn_count--; c->tcp.splice_conn_count--;
tcp_table_compact(c, (union tcp_conn *)conn); tcp_table_compact(c, conn_union);
} }
/** /**
@ -824,12 +826,14 @@ void tcp_splice_init(struct ctx *c)
/** /**
* tcp_splice_timer() - Timer for spliced connections * tcp_splice_timer() - Timer for spliced connections
* @c: Execution context * @c: Execution context
* @conn: Spliced connection * @conn_union: Spliced connection (container union)
*/ */
void tcp_splice_timer(struct ctx *c, struct tcp_splice_conn *conn) void tcp_splice_timer(struct ctx *c, union tcp_conn *conn_union)
{ {
struct tcp_splice_conn *conn = &conn_union->splice;
if (conn->flags & CLOSING) { if (conn->flags & CLOSING) {
tcp_splice_destroy(c, conn); tcp_splice_destroy(c, conn_union);
return; return;
} }