[Openvpn-devel,v1] dco_linux: check ovpn_dco_nlmsg_create() result in new/get peer

Message ID 20261116102516.14493-1-gert@greenie.muc.de
State New
Headers
Series [Openvpn-devel,v1] dco_linux: check ovpn_dco_nlmsg_create() result in new/get peer |

Commit Message

Gert Doering Nov. 16, 2026, 10:25 a.m. UTC
  From: Razvan Cojocaru <razvanc@mailbox.org>

dco_new_peer() and dco_get_peer() passed the result straight to
nla_nest_start() without checking for NULL. Return -ENOMEM like the
other callers.

dco_new_peer() unchecked since e34437c2 ("dco: introduce low-level code
for handling ovpn-dco in the Linux kernel"), dco_get_peer() since
5a8fb55a ("dco-linux: implement dco_get_peer_stats{, multi} API").

Change-Id: Idb3c52174e588016240e9c9162a1676e1531c551
Signed-off-by: Razvan Cojocaru <razvanc@mailbox.org>
Acked-by: Antonio Quartulli <antonio@mandelbit.com>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2101
---

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2101
This mail reflects revision 1 of this Change.

Acked-by according to Gerrit (reflected above):
Antonio Quartulli <antonio@mandelbit.com>
  

Comments

Gert Doering Nov. 16, 2026, 6:55 p.m. UTC | #1
This is a clear bugfix, and straightforward as such ;-)

t_client tested on 2.7+DCO.

Your patch has been applied to the master and release/2.7 branch.

commit bbc14868ef99a16eda987396b890ec8df6427dcf (master)
commit 790fe3b03e10bb40a10db1c599f769ccdaff5ad7 (release/2.7)
Author: Razvan Cojocaru
Date:   Mon Nov 16 11:25:11 2026 +0100

     dco_linux: check ovpn_dco_nlmsg_create() result in new/get peer

     Signed-off-by: Razvan Cojocaru <razvanc@mailbox.org>
     Acked-by: Antonio Quartulli <antonio@mandelbit.com>
     Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2101
     Message-Id: <20261116102516.14493-1-gert@greenie.muc.de>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg41409.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
  

Patch

diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c
index 4412ad0..50d4c54 100644
--- a/src/openvpn/dco_linux.c
+++ b/src/openvpn/dco_linux.c
@@ -234,6 +234,12 @@ 
     msg(D_DCO_DEBUG, "%s: peer-id %u, fd %d, remote addr: %s", __func__, peerid, sd, remotestr);
 
     struct nl_msg *nl_msg = ovpn_dco_nlmsg_create(dco, OVPN_CMD_PEER_NEW);
+    if (!nl_msg)
+    {
+        gc_free(&gc);
+        return -ENOMEM;
+    }
+
     struct nlattr *attr = nla_nest_start(nl_msg, OVPN_A_PEER);
     int ret = -EMSGSIZE;
 
@@ -1229,6 +1235,11 @@ 
     msg(D_DCO_DEBUG | M_NOIPREFIX, "%s: peer-id %d", __func__, peer_id);
 
     struct nl_msg *nl_msg = ovpn_dco_nlmsg_create(dco, OVPN_CMD_PEER_GET);
+    if (!nl_msg)
+    {
+        return -ENOMEM;
+    }
+
     struct nlattr *attr = nla_nest_start(nl_msg, OVPN_A_PEER);
     int ret = -EMSGSIZE;