Fix handling of 'route remote_host' for IPv6 transport case.
PATCH 1/1 Fix handling of 'route remote_host' for IPv6 transport case.
If we connect to a VPN server over IPv6, and the config has a route like this:
route remote_host default net_gateway
OpenVPN would try to install a route to "255.255.255.255", which is obviously bogus.
The bug is twofold: init_route_list() should not set RTSA_REMOTE_HOST for an "IPV4_INVALID_ADDR" remote_host (wrong condition, this is not a pointer but an integer, and "invalid" is "-1" numerically here), and init_route() must not ignore "status = false" returns from get_special_addr().
I have just added the "if (!status)" check, not done refactoring for init_route() to see whether I could make it "more pretty".
Trac: #1247
--- src/openvpn/route.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
src/openvpn/route.c +5 -1
@@ -323,6 +323,10 @@ init_route(struct route_ipv4 *r,if (get_special_addr (rl, ro->network, (in_addr_t *) &special.s_addr, &status)) { +if (!status) + { + goto fail; + } special.s_addr =htonl (special.s_addr); ret =openvpn_getaddrinfo (0 ,inet_ntoa (special),NULL ,0 ,NULL ,AF_INET , network_list);
@@ -619,7 +623,7 @@ init_route_list(struct route_list *rl, rl->flags = opt->flags; -if (remote_host) +if (remote_host !=IPV4_INVALID_ADDR ) { rl->spec.remote_host = remote_host; rl->spec.flags |=RTSA_REMOTE_HOST ;
Signature · 1 line
2.26.2
Am 11.09.20 um 10:59 schrieb Gert Doering:
Quoted 8 lines
If we connect to a VPN server over IPv6, and the config has a route like this:
route
remote_hostdefaultnet_gatewayOpenVPN would try to install a route to "255.255.255.255", which is obviously bogus.
Quoted 10 lines
The bug is twofold:
init_route_list()should not setRTSA_REMOTE_HOSTfor an "IPV4_INVALID_ADDR"remote_host(wrong condition, this is not a pointer but an integer, and "invalid" is "-1" numerically here), andinit_route()must not ignore "status = false" returns fromget_special_addr().I have just added the "if (!status)" check, not done refactoring for
init_route()to see whether I could make it "more pretty".
Looks good.
Patch has been applied to lots of branches... :)
commit aa34684972eb01bfa5c355d1c8a8a9d384bf0175 (master) commit 78c50eba82fe9bf9a899cb8587e11dcc227c0cdd (release/2.5) commit 09e46c3ca7ead4e7b817fa527302dfb1a2f225d0 (release/2.4)
Author: Gert Doering Date: Fri Sep 11 10:59:07 2020 +0200
Fix handling of 'route remote_host' for IPv6 transport case.
Signed-off-by: Gert Doering <[email protected]...>
Acked-by: Arne Schwabe <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg20958.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering