[Openvpn-devel,v2] Add missing check for nl_socket_alloc failure

Message ID 20230425102021.1041755-1-arne@rfc2549.org
State Not Applicable
Headers show
Series [Openvpn-devel,v2] Add missing check for nl_socket_alloc failure | expand

Commit Message

Arne Schwabe April 25, 2023, 10:20 a.m. UTC
This can happen if the memory alloc fails.

Patch V2: add goto error

Change-Id: Iee66caa794d267ac5f8bee584633352893047171
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
---
 src/openvpn/dco_linux.c | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Antonio Quartulli April 26, 2023, 11:44 a.m. UTC | #1
Hi,

On 25/04/2023 12:20, Arne Schwabe wrote:
> This can happen if the memory alloc fails.
> 
> Patch V2: add goto error
> 
> Change-Id: Iee66caa794d267ac5f8bee584633352893047171
> Signed-off-by: Arne Schwabe <arne@rfc2549.org>

This patch seems to be a duplicate?
I also commented the "old v2".

Cheers,

> ---
>   src/openvpn/dco_linux.c | 7 +++++++
>   1 file changed, 7 insertions(+)
> 
> diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c
> index 41540c0f8..95fe94848 100644
> --- a/src/openvpn/dco_linux.c
> +++ b/src/openvpn/dco_linux.c
> @@ -83,6 +83,13 @@ resolve_ovpn_netlink_id(int msglevel)
>       int ret;
>       struct nl_sock *nl_sock = nl_socket_alloc();
>   
> +    if (!nl_sock)
> +    {
> +        msg(msglevel, "Allocating net link socket failed");
> +        ret = -1;
> +        goto err_sock;
> +    }
> +
>       ret = genl_connect(nl_sock);
>       if (ret)
>       {

Patch

diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c
index 41540c0f8..95fe94848 100644
--- a/src/openvpn/dco_linux.c
+++ b/src/openvpn/dco_linux.c
@@ -83,6 +83,13 @@  resolve_ovpn_netlink_id(int msglevel)
     int ret;
     struct nl_sock *nl_sock = nl_socket_alloc();
 
+    if (!nl_sock)
+    {
+        msg(msglevel, "Allocating net link socket failed");
+        ret = -1;
+        goto err_sock;
+    }
+
     ret = genl_connect(nl_sock);
     if (ret)
     {