[Bluez,V2,01/13] Fixing memory leak issue in gatt.c

Message ID	20220531074117.610321-2-gopalkrishna.tiwari@gmail.com
State	New
Headers	show Return-Path: <linux-bluetooth-owner@kernel.org> From: Gopal Tiwari <gopalkrishna.tiwari@gmail.com> To: linux-bluetooth@vger.kernel.org Cc: luiz.dentz@gmail.com, gtiwari@redhat.com Subject: [Bluez V2 01/13] Fixing memory leak issue in gatt.c Date: Tue, 31 May 2022 13:11:05 +0530 Message-Id: <20220531074117.610321-2-gopalkrishna.tiwari@gmail.com> In-Reply-To: <20220531074117.610321-1-gopalkrishna.tiwari@gmail.com> References: <20220531074117.610321-1-gopalkrishna.tiwari@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Fixing memory leak, leaked_handle and use_after \| expand [Bluez,00/13] Fixing memory leak, leaked_handle and use_after [Bluez,V2,01/13] Fixing memory leak issue in gatt.c [Bluez,V2,02/13] Fixing memory leakage in appkey.c [Bluez,V2,03/13] Fixing memory leak in jlink.c [Bluez,V2,04/13] Fixing memory leak in sixaxis.c [Bluez,V2,05/13] Fixing leaked_handle in cltest.c [Bluez,V2,06/13] Fixing leaked_handle in create-image.c [Bluez,V2,07/13] Fixing leaked_handle in l2cap-tester.c [Bluez,V2,08/13] Fixing resource leak in mesh/mesh-db.c [Bluez,V2,09/13] Fixing leaked_handle in obex-client-tool.c [Bluez,V2,10/13] Fixing use after free in src/device.c [Bluez,V2,11/13] Fixing memory leak in pbap.c [Bluez,V2,12/13] Fixing possible use_after_free in meshctl.c [Bluez,V2,13/13] Fixing use_after_free in prov-db.c

Message ID

20220531074117.610321-2-gopalkrishna.tiwari@gmail.com

State

New

Headers

From: Gopal Tiwari <gopalkrishna.tiwari@gmail.com>
To: linux-bluetooth@vger.kernel.org
Cc: luiz.dentz@gmail.com, gtiwari@redhat.com
Subject: [Bluez V2 01/13] Fixing memory leak issue in gatt.c
Date: Tue, 31 May 2022 13:11:05 +0530
Message-Id: <20220531074117.610321-2-gopalkrishna.tiwari@gmail.com>
In-Reply-To: <20220531074117.610321-1-gopalkrishna.tiwari@gmail.com>
References: <20220531074117.610321-1-gopalkrishna.tiwari@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

Fixing memory leak, leaked_handle and use_after | expand

Commit Message

Gopal Tiwari May 31, 2022, 7:41 a.m. UTC

From: Gopal Tiwari <gtiwari@redhat.com>

While performing the static tool analysis using coverity tool 
found following reports

Error: RESOURCE_LEAK (CWE-772):
bluez-5.64/client/gatt.c:1531: leaked_storage: Variable "service" 
going out of scope leaks the storage it points to.

Error: RESOURCE_LEAK (CWE-772):
bluez-5.64/client/gatt.c:2626: leaked_storage: Variable "chrc" 
going out of scope leaks the storage it points to.

Error: RESOURCE_LEAK (CWE-772):
bluez-5.64/client/gatt.c:2906: leaked_storage: Variable "desc" 
going out of scope leaks the storage it points to.

Fixing them.

Signed-off-by: Gopal Tiwari <gtiwari@redhat.com>
---
 client/gatt.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/client/gatt.c b/client/gatt.c
index 13872c794..4c1efaf75 100644
--- a/client/gatt.c
+++ b/client/gatt.c
@@ -1527,8 +1527,10 @@  void gatt_register_service(DBusConnection *conn, GDBusProxy *proxy,
 
 	if (argc > 2) {
 		service->handle = parse_handle(argv[2]);
-		if (!service->handle)
+		if (!service->handle) {
+			service_free(service);
 			return bt_shell_noninteractive_quit(EXIT_FAILURE);
+		}
 	}
 
 	if (g_dbus_register_interface(conn, service->path,
@@ -2622,8 +2624,10 @@  void gatt_register_chrc(DBusConnection *conn, GDBusProxy *proxy,
 
 	if (argc > 3) {
 		chrc->handle = parse_handle(argv[3]);
-		if (!chrc->handle)
+		if (!chrc->handle) {
+			chrc_free(chrc);
 			return bt_shell_noninteractive_quit(EXIT_FAILURE);
+		}
 	}
 
 	if (g_dbus_register_interface(conn, chrc->path, CHRC_INTERFACE,
@@ -2902,8 +2906,10 @@  void gatt_register_desc(DBusConnection *conn, GDBusProxy *proxy,
 
 	if (argc > 3) {
 		desc->handle = parse_handle(argv[3]);
-		if (!desc->handle)
+		if (!desc->handle) {
+			desc_free(desc);
 			return bt_shell_noninteractive_quit(EXIT_FAILURE);
+		}
 	}
 
 	if (g_dbus_register_interface(conn, desc->path, DESC_INTERFACE,

[Bluez,V2,01/13] Fixing memory leak issue in gatt.c

Commit Message

Patch