diff mbox series

two patches added to cifs-utils for-next branch

Message ID CAH2r5muQRk_-JdHbPcGY9Zu7BYZ50nYHRSDJbbTA=Mi2EdBDuA@mail.gmail.com (mailing list archive)
State New
Headers show
Series two patches added to cifs-utils for-next branch | expand

Commit Message

Steve French March 11, 2025, 3:09 a.m. UTC 
See attached.  Also added to my smb3-utils repo on github

If any objections or review comments, let us know.
diff mbox series

Patch

From 901409a2ef6bb5b72a6f774713f754ec7cc3eca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= <pfilipensky@samba.org>
Date: Wed, 9 Oct 2024 12:37:12 +0200
Subject: [PATCH 1/2] cldap_ping: Fix socket fd leak
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

reported by Red Hat code analyzer:

cifs-utils-7.1/cldap_ping.c:323:3: leaked_handle: Handle variable "sock" going out of scope leaks the handle.

Signed-off-by: Pavel Filipenský <pfilipensky@samba.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
---
 cldap_ping.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cldap_ping.c b/cldap_ping.c
index a603be3..5c20f84 100644
--- a/cldap_ping.c
+++ b/cldap_ping.c
@@ -318,9 +318,11 @@  int cldap_ping(char *domain, sa_family_t family, void *addr, char *site_name) {
 
 	struct timeval timeout = {.tv_sec = 2, .tv_usec = 0};
 	if (setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(timeout)) < 0) {
+		close(sock);
 		return CLDAP_PING_NETWORK_ERROR;
 	}
 	if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout)) < 0) {
+		close(sock);
 		return CLDAP_PING_NETWORK_ERROR;
 	}
 
-- 
2.43.0