From 3dca6099d4f1a32c2e2ddbabe88a49d786fb3c41 Mon Sep 17 00:00:00 2001
From: Zoltan Papp <zoltan.pmail@gmail.com>
Date: Mon, 30 Sep 2024 10:34:57 +0200
Subject: [PATCH] Fix ebpf close function (#2672)

---
 client/internal/wgproxy/ebpf/proxy.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/internal/wgproxy/ebpf/proxy.go b/client/internal/wgproxy/ebpf/proxy.go
index 4bd4bfff6..27ede3ef1 100644
--- a/client/internal/wgproxy/ebpf/proxy.go
+++ b/client/internal/wgproxy/ebpf/proxy.go
@@ -81,8 +81,7 @@ func (p *WGEBPFProxy) Listen() error {
 
 	conn, err := nbnet.ListenUDP("udp", &addr)
 	if err != nil {
-		cErr := p.Free()
-		if cErr != nil {
+		if cErr := p.Free(); cErr != nil {
 			log.Errorf("Failed to close the wgproxy: %s", cErr)
 		}
 		return err
@@ -122,8 +121,10 @@ func (p *WGEBPFProxy) Free() error {
 	p.ctxCancel()
 
 	var result *multierror.Error
-	if err := p.conn.Close(); err != nil {
-		result = multierror.Append(result, err)
+	if p.conn != nil { // p.conn will be nil if we have failed to listen
+		if err := p.conn.Close(); err != nil {
+			result = multierror.Append(result, err)
+		}
 	}
 
 	if err := p.ebpfManager.FreeWGProxy(); err != nil {