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

tcp, udp: Fix partial success return codes in {tcp,udp}_sock_init()

Browse source 
The comments say we should return 0 on partial success, and an error
code on complete failure. Rationale: if the user configures a port
forwarding, and we succeed to bind that port for IPv4 or IPv6 only,
that might actually be what the user intended.

Adjust the two functions to reflect the comments.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Stefano Brivio 2023-03-08 12:38:39 +01:00
parent 73992c42ce
commit 5aea2f88ab
2 changed files with 23 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tcp.c
View file

@ -2993,7 +2993,7 @@ static int tcp_sock_init_af(const struct ctx *c, int af, in_port_t port,
int tcp_sock_init(const struct ctx *c, sa_family_t af, const void *addr, int tcp_sock_init(const struct ctx *c, sa_family_t af, const void *addr,
const char *ifname, in_port_t port) const char *ifname, in_port_t port)
{ {
int ret = 0, af_ret; int r4 = SOCKET_MAX + 1, r6 = SOCKET_MAX + 1;
if (af == AF_UNSPEC && c->ifi4 && c->ifi6) if (af == AF_UNSPEC && c->ifi4 && c->ifi6)
/* Attempt to get a dual stack socket */ /* Attempt to get a dual stack socket */
@ -3001,19 +3001,16 @@ int tcp_sock_init(const struct ctx *c, sa_family_t af, const void *addr,
return 0; return 0;
/* Otherwise create a socket per IP version */ /* Otherwise create a socket per IP version */
if ((af == AF_INET || af == AF_UNSPEC) && c->ifi4) { if ((af == AF_INET || af == AF_UNSPEC) && c->ifi4)
af_ret = tcp_sock_init_af(c, AF_INET, port, addr, ifname); r4 = tcp_sock_init_af(c, AF_INET, port, addr, ifname);
if (af_ret < 0)
ret = af_ret;
}
if ((af == AF_INET6 || af == AF_UNSPEC) && c->ifi6) { if ((af == AF_INET6 || af == AF_UNSPEC) && c->ifi6)
af_ret = tcp_sock_init_af(c, AF_INET6, port, addr, ifname); r6 = tcp_sock_init_af(c, AF_INET6, port, addr, ifname);
if (af_ret < 0)
ret = af_ret;
}
return ret; if (IN_INTERVAL(0, SOCKET_MAX, r4) || IN_INTERVAL(0, SOCKET_MAX, r6))
return 0;
return r4 < 0 ? r4 : r6;
} }
/** /**

30
udp.c
View file

@ -983,7 +983,7 @@ int udp_sock_init(const struct ctx *c, int ns, sa_family_t af,
const void *addr, const char *ifname, in_port_t port) const void *addr, const char *ifname, in_port_t port)
{ {
union udp_epoll_ref uref = { .u32 = 0 }; union udp_epoll_ref uref = { .u32 = 0 };
int s, ret = 0; int s, r4 = SOCKET_MAX + 1, r6 = SOCKET_MAX + 1;
if (ns) { if (ns) {
uref.udp.port = (in_port_t)(port + uref.udp.port = (in_port_t)(port +
@ -999,8 +999,8 @@ int udp_sock_init(const struct ctx *c, int ns, sa_family_t af,
uref.udp.orig = true; uref.udp.orig = true;
if (!ns) { if (!ns) {
s = sock_l4(c, AF_INET, IPPROTO_UDP, addr, ifname, r4 = s = sock_l4(c, AF_INET, IPPROTO_UDP, addr,
port, uref.u32); ifname, port, uref.u32);
udp_tap_map[V4][uref.udp.port].sock = s < 0 ? -1 : s; udp_tap_map[V4][uref.udp.port].sock = s < 0 ? -1 : s;
udp_splice_init[V4][port].sock = s < 0 ? -1 : s; udp_splice_init[V4][port].sock = s < 0 ? -1 : s;
@ -1008,13 +1008,10 @@ int udp_sock_init(const struct ctx *c, int ns, sa_family_t af,
struct in_addr loopback = { htonl(INADDR_LOOPBACK) }; struct in_addr loopback = { htonl(INADDR_LOOPBACK) };
uref.udp.ns = true; uref.udp.ns = true;
s = sock_l4(c, AF_INET, IPPROTO_UDP, &loopback, r4 = s = sock_l4(c, AF_INET, IPPROTO_UDP, &loopback,
ifname, port, uref.u32); ifname, port, uref.u32);
udp_splice_ns[V4][port].sock = s < 0 ? -1 : s; udp_splice_ns[V4][port].sock = s < 0 ? -1 : s;
} }
if (s < 0)
ret = s;
} }
if ((af == AF_INET6 || af == AF_UNSPEC) && c->ifi6) { if ((af == AF_INET6 || af == AF_UNSPEC) && c->ifi6) {
@ -1023,24 +1020,25 @@ int udp_sock_init(const struct ctx *c, int ns, sa_family_t af,
uref.udp.orig = true; uref.udp.orig = true;
if (!ns) { if (!ns) {
s = sock_l4(c, AF_INET6, IPPROTO_UDP, addr, ifname, r6 = s = sock_l4(c, AF_INET6, IPPROTO_UDP, addr,
port, uref.u32); ifname, port, uref.u32);
udp_tap_map[V6][uref.udp.port].sock = s < 0 ? -1 : s; udp_tap_map[V6][uref.udp.port].sock = s < 0 ? -1 : s;
udp_splice_init[V6][port].sock = s < 0 ? -1 : s; udp_splice_init[V6][port].sock = s < 0 ? -1 : s;
} else { } else {
uref.udp.ns = true; uref.udp.ns = true;
s = sock_l4(c, AF_INET6, IPPROTO_UDP, &in6addr_loopback, r6 = s = sock_l4(c, AF_INET6, IPPROTO_UDP,
ifname, port, uref.u32); &in6addr_loopback,
ifname, port, uref.u32);
udp_splice_ns[V6][port].sock = s < 0 ? -1 : s; udp_splice_ns[V6][port].sock = s < 0 ? -1 : s;
} }
if (s < 0)
ret = s;
} }
return ret; if (IN_INTERVAL(0, SOCKET_MAX, r4) || IN_INTERVAL(0, SOCKET_MAX, r6))
return 0;
return r4 < 0 ? r4 : r6;
} }
/** /**