|
 |
67d7dc |
From fc57aa92a4f32f7c0f38198e6d26b529b537a047 Mon Sep 17 00:00:00 2001
|
|
|
67d7dc |
From: Gopal Tiwari <gtiwari@redhat.com>
|
|
|
67d7dc |
Date: Tue, 31 May 2022 13:11:08 +0530
|
|
|
67d7dc |
Subject: [PATCH BlueZ 04/12] sixaxis: Fix memory leaks
|
|
|
67d7dc |
|
|
|
67d7dc |
While performing static tool analysis using coverity
|
|
|
67d7dc |
found following reports for resouse leak
|
|
|
67d7dc |
|
|
|
67d7dc |
bluez-5.64/plugins/sixaxis.c:425: alloc_arg:
|
|
|
67d7dc |
"get_pairing_type_for_device" allocates memory that is
|
|
|
67d7dc |
stored into "sysfs_path".
|
|
|
67d7dc |
|
|
|
67d7dc |
bluez-5.64/plugins/sixaxis.c:428: leaked_storage: Variable "sysfs_path"
|
|
|
67d7dc |
going out of scope leaks the storage it points to.
|
|
|
67d7dc |
---
|
|
|
67d7dc |
plugins/sixaxis.c | 9 +++++++--
|
|
|
67d7dc |
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
67d7dc |
|
|
|
67d7dc |
diff --git a/plugins/sixaxis.c b/plugins/sixaxis.c
|
|
|
67d7dc |
index ddecbcccb..10cf15948 100644
|
|
|
67d7dc |
--- a/plugins/sixaxis.c
|
|
|
67d7dc |
+++ b/plugins/sixaxis.c
|
|
|
67d7dc |
@@ -424,10 +424,15 @@ static void device_added(struct udev_device *udevice)
|
|
|
67d7dc |
|
|
|
67d7dc |
cp = get_pairing_type_for_device(udevice, &bus, &sysfs_path);
|
|
|
67d7dc |
if (!cp || (cp->type != CABLE_PAIRING_SIXAXIS &&
|
|
|
67d7dc |
- cp->type != CABLE_PAIRING_DS4))
|
|
|
67d7dc |
+ cp->type != CABLE_PAIRING_DS4)) {
|
|
|
67d7dc |
+ g_free(sysfs_path);
|
|
|
67d7dc |
return;
|
|
|
67d7dc |
- if (bus != BUS_USB)
|
|
|
67d7dc |
+ }
|
|
|
67d7dc |
+
|
|
|
67d7dc |
+ if (bus != BUS_USB) {
|
|
|
67d7dc |
+ g_free(sysfs_path);
|
|
|
67d7dc |
return;
|
|
|
67d7dc |
+ }
|
|
|
67d7dc |
|
|
|
67d7dc |
info("sixaxis: compatible device connected: %s (%04X:%04X %s)",
|
|
|
67d7dc |
cp->name, cp->vid, cp->pid, sysfs_path);
|
|
|
67d7dc |
--
|
|
|
67d7dc |
2.26.2
|
|
|
67d7dc |
|