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

passt, tap: Don't use -1 as uninitialised value for fd_tap_listen

Browse source 
This is a remnant from the time we kept access to the original
filesystem and we could reinitialise the listening AF_UNIX socket.

Since commit 0515adceaa ("passt, pasta: Namespace-based sandboxing,
defer seccomp policy application"), however, we can't re-bind the
listening socket once we're up and running.

Drop the -1 initalisation and the corresponding check.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Stefano Brivio 2024-05-22 19:35:25 +02:00
parent d02bb6ca05
commit fcfb592adc
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
passt.c
View file

@ -211,7 +211,7 @@ int main(int argc, char **argv)
isolate_initial(); isolate_initial();
c.pasta_netns_fd = c.fd_tap = c.fd_tap_listen = -1; c.pasta_netns_fd = c.fd_tap = -1;
sigemptyset(&sa.sa_mask); sigemptyset(&sa.sa_mask);
sa.sa_flags = 0; sa.sa_flags = 0;

3
tap.c
View file

@ -1304,8 +1304,7 @@ void tap_sock_init(struct ctx *c)
} }
if (c->mode == MODE_PASST) { if (c->mode == MODE_PASST) {
if (c->fd_tap_listen == -1) tap_sock_unix_init(c);
tap_sock_unix_init(c);
/* In passt mode, we don't know the guest's MAC address until it /* In passt mode, we don't know the guest's MAC address until it
* sends us packets. Use the broadcast address so that our * sends us packets. Use the broadcast address so that our