upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-05-28 04:03:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

dco_linux: use M_FATAL instead of M_ERR in netlink error code paths

Browse source 
Netlink code doesn't set errno upon error (with the exception of
any *alloc() function which probably inherits the errno=ENOMEM
from the underlying malloc call), therefore we should not print
error messages with M_ERR, but rather rely on M_FATAL.

M_ERR is equivalent to M_FATAL with the addition of appending
": $errno" to the error string.

Since errno is not meaningful in this context, we can just opt
for the less confusing M_FATAL.

Change-Id: Ifc442b4426c02de7282d0f69629e8a10b679c589
Signed-off-by: Antonio Quartulli <antonio@mandelbit.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20250723063039.25449-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32271.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Antonio Quartulli 2025-07-23 08:30:30 +02:00 committed by Gert Doering
parent f1a2a37897
commit dfe71b0a39
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/openvpn/dco_linux.c
View file

@ -114,7 +114,7 @@ ovpn_dco_nlmsg_create(dco_context_t *dco, int cmd)
struct nl_msg *nl_msg = nlmsg_alloc();
if (!nl_msg)
{
msg(M_ERR, "cannot allocate netlink message");
msg(M_FATAL, "cannot allocate netlink message");
return NULL;
}
@ -140,7 +140,7 @@ ovpn_nl_recvmsgs(dco_context_t *dco, const char *prefix)
break;
case -NLE_NOMEM:
msg(M_ERR, "%s: netlink out of memory error", prefix);
msg(M_FATAL, "%s: netlink out of memory error", prefix);
break;
case -NLE_AGAIN:
@ -148,7 +148,7 @@ ovpn_nl_recvmsgs(dco_context_t *dco, const char *prefix)
break;
case -NLE_NODEV:
msg(M_ERR, "%s: netlink reports device not found:", prefix);
msg(M_FATAL, "%s: netlink reports device not found:", prefix);
break;
case -NLE_OBJ_NOTFOUND:
@ -387,19 +387,19 @@ ovpn_nl_cb_error(struct sockaddr_nl (*nla) __attribute__ ((unused)),
static void
ovpn_dco_init_netlink(dco_context_t *dco)
{
dco->ovpn_dco_id = resolve_ovpn_netlink_id(M_ERR);
dco->ovpn_dco_id = resolve_ovpn_netlink_id(M_FATAL);
dco->nl_sock = nl_socket_alloc();
if (!dco->nl_sock)
{
msg(M_ERR, "Cannot create netlink socket");
msg(M_FATAL, "Cannot create netlink socket");
}
int ret = genl_connect(dco->nl_sock);
if (ret)
{
msg(M_ERR, "Cannot connect to generic netlink: %s",
msg(M_FATAL, "Cannot connect to generic netlink: %s",
nl_geterror(ret));
}
@ -415,7 +415,7 @@ ovpn_dco_init_netlink(dco_context_t *dco)
dco->nl_cb = nl_cb_alloc(NL_CB_DEFAULT);
if (!dco->nl_cb)
{
msg(M_ERR, "failed to allocate netlink callback");
msg(M_FATAL, "failed to allocate netlink callback");
}
nl_socket_set_cb(dco->nl_sock, dco->nl_cb);
@ -478,7 +478,7 @@ ovpn_dco_register(dco_context_t *dco)
if (dco->ovpn_dco_mcast_id < 0)
{
msg(M_ERR, "cannot get mcast group: %s", nl_geterror(dco->ovpn_dco_mcast_id));
msg(M_FATAL, "cannot get mcast group: %s", nl_geterror(dco->ovpn_dco_mcast_id));
}
/* Register for ovpn-dco specific multicast messages that the kernel may
@ -487,7 +487,7 @@ ovpn_dco_register(dco_context_t *dco)
int ret = nl_socket_add_membership(dco->nl_sock, dco->ovpn_dco_mcast_id);
if (ret)
{
msg(M_ERR, "%s: failed to join groups: %d", __func__, ret);
msg(M_FATAL, "%s: failed to join groups: %d", __func__, ret);
}
}