Fix various memory leaks
PATCH 1/1 Fix various memory leaks
Hello,
I was checking the code via static analysis and found a number of leaks throughout the code. This patch should address most of what was discovered.
--- mesh/rpl.c | 4 +++- obexd/plugins/filesystem.c | 2 +- obexd/plugins/ftp.c | 8 ++++++-- obexd/plugins/messages-dummy.c | 1 + plugins/hostname.c | 3 +-- profiles/audio/avrcp.c | 4 +++- src/main.c | 1 + src/shared/shell.c | 1 + tools/mesh-cfgclient.c | 2 +- tools/mesh-gatt/gatt.c | 1 + tools/mesh-gatt/node.c | 12 +++++++++--- 11 files changed, 28 insertions(+), 11 deletions(-)
mesh/rpl.c +3 -1
@@ -143,8 +143,10 @@ static void get_entries(const char *iv_path, struct l_queue *rpl_list)return ; iv_txt =basename (iv_path); -if (sscanf (iv_txt,"%08x" , &iv_index) !=1 ) +if (sscanf (iv_txt,"%08x" , &iv_index) !=1 ) { +closedir (dir);return ; + }memset (seq_txt,0 ,sizeof (seq_txt));
obexd/plugins/filesystem.c +1 -1
@@ -415,7 +415,7 @@ static void *capability_open(const char *name, int oflag, mode_t mode, goto fail; } - object->buffer =g_string_new (buf); + object->buffer = buf;if (size) *size = object->buffer->len;
obexd/plugins/ftp.c +6 -2
@@ -386,8 +386,10 @@ static int ftp_copy(struct ftp_session *ftp, const char *name, ret =verify_path (destdir);g_free (destdir); -if (ret <0 ) +if (ret <0 ) { +g_free (destination);return ret; + } source =g_build_filename (ftp->folder, name,NULL );
@@ -424,8 +426,10 @@ static int ftp_move(struct ftp_session *ftp, const char *name, ret =verify_path (destdir);g_free (destdir); -if (ret <0 ) +if (ret <0 ) { +g_free (destination);return ret; + } source =g_build_filename (ftp->folder, name,NULL );
obexd/plugins/messages-dummy.c +1 -0
@@ -488,6 +488,7 @@ int messages_get_messages_listing(void *session, const char *name,int err = -errno;DBG ("fopen(): %d, %s" , -err,strerror (-err));g_free (path); +g_free (mld);return -EBADR ; } }
plugins/hostname.c +1 -2
@@ -213,11 +213,10 @@ static void read_dmi_fallback(void)return ; type =atoi (contents); +g_free (contents);if (type <0 || type >0x1D )return ; -g_free (contents); -/* from systemd hostname chassis list */ switch (type) {case 0x3 :
profiles/audio/avrcp.c +3 -1
@@ -3508,8 +3508,10 @@ static struct avrcp_player *create_ct_player(struct avrcp *session, path =device_get_path (session->dev); mp =media_player_controller_create (path, id); -if (mp ==NULL ) +if (mp ==NULL ) { +g_free (player);return NULL ; + }media_player_set_callbacks (mp, &ct_cbs, player); player->user_data = mp;
src/main.c +1 -0
@@ -795,6 +795,7 @@ static void parse_config(GKeyFile *config)parse_br_config (config);parse_le_config (config); +g_free (str); }static void init_defaults (void )
src/shared/shell.c +1 -0
@@ -611,6 +611,7 @@ void bt_shell_prompt_input(const char *label, const char *msg, prompt->user_data = user_data;queue_push_tail (data.prompts, prompt); +g_free (str);return ; }
tools/mesh-cfgclient.c +1 -1
@@ -914,7 +914,7 @@ static void cmd_import_node(int argc, char *argv[])/* Number of elements */ if (sscanf (argv[4 ],"%u" , &req->arg3) !=1 ) -return ; + goto fail;/* DevKey */ req->data2 =l_util_from_hexstring (argv[5 ], &sz);
tools/mesh-gatt/gatt.c +1 -0
@@ -525,6 +525,7 @@ bool mesh_gatt_notify(GDBusProxy *proxy, bool enable, GDBusReturnFunction cb,notify_io_destroy ();if (cb)cb (NULL , user_data); +g_free (data);return true; }else { method ="StopNotify" ;
tools/mesh-gatt/node.c +9 -3
@@ -396,8 +396,10 @@ bool node_parse_composition(struct mesh_node *node, uint8_t *data, uint16_t len)uint16_t vendor_id;struct mesh_element *ele; ele =g_malloc0 (sizeof (struct mesh_element )); -if (!ele) +if (!ele) { +g_free (comp);return false; + } ele->index = i; ele->loc =get_le16 (data);
@@ -412,8 +414,10 @@ bool node_parse_composition(struct mesh_node *node, uint8_t *data, uint16_t len) mod_id =get_le16 (data);/* initialize uppper 16 bits to 0xffff for SIG models */ mod_id |=0xffff0000 ; -if (!node_set_model (node, ele->index, mod_id)) +if (!node_set_model (node, ele->index, mod_id)) { +g_free (comp);return false; + } data +=2 ; len -=2 ; }
@@ -421,8 +425,10 @@ bool node_parse_composition(struct mesh_node *node, uint8_t *data, uint16_t len) mod_id =get_le16 (data +2 ); vendor_id =get_le16 (data); mod_id |= (vendor_id <<16 ); -if (!node_set_model (node, ele->index, mod_id)) +if (!node_set_model (node, ele->index, mod_id)) { +g_free (comp);return false; + } data +=4 ; len -=4 ; }
Signature · 1 line
2.31.1
Luiz Augusto von Dentz
maintainerHi Steve,
Quoted 6 lines · Steve Grubb
Hello,
I was checking the code via static analysis and found a number of leaks throughout the code. This patch should address most of what was discovered.
Could you please split these changes into mesh, obex, etc, this should make it easier to bisect if we found there is some problem introduced by these changes.
Quoted 209 lines
Signed-off-by Steve Grubb <[email protected]>--- mesh/rpl.c | 4 +++- obexd/plugins/filesystem.c | 2 +- obexd/plugins/ftp.c | 8 ++++++-- obexd/plugins/messages-dummy.c | 1 + plugins/hostname.c | 3 +-- profiles/audio/avrcp.c | 4 +++- src/main.c | 1 + src/shared/shell.c | 1 + tools/mesh-cfgclient.c | 2 +- tools/mesh-gatt/gatt.c | 1 + tools/mesh-gatt/node.c | 12 +++++++++--- 11 files changed, 28 insertions(+), 11 deletions(-)mesh/rpl.c +3
-1@@ -143,8 +143,10 @@ static void get_entries(const char *iv_path, struct l_queue *rpl_list)return ; iv_txt =basename (iv_path); -if (sscanf (iv_txt,"%08x" , &iv_index) !=1 ) +if (sscanf (iv_txt,"%08x" , &iv_index) !=1 ) { +closedir (dir);return ; + }memset (seq_txt,0 ,sizeof (seq_txt));obexd/plugins/filesystem.c +1
-1@@ -415,7 +415,7 @@ static void *capability_open(const char *name, int oflag, mode_t mode, goto fail; } - object->buffer =g_string_new (buf); + object->buffer = buf;if (size) *size = object->buffer->len;obexd/plugins/ftp.c +6
-2@@ -386,8 +386,10 @@ static int ftp_copy(struct ftp_session *ftp, const char *name, ret =verify_path (destdir);g_free (destdir); -if (ret <0 ) +if (ret <0 ) { +g_free (destination);return ret; + } source =g_build_filename (ftp->folder, name,NULL );@@ -424,8 +426,10 @@ static int ftp_move(struct ftp_session *ftp, const char *name, ret =verify_path (destdir);g_free (destdir); -if (ret <0 ) +if (ret <0 ) { +g_free (destination);return ret; + } source =g_build_filename (ftp->folder, name,NULL );obexd/plugins/messages-dummy.c +1
-0@@ -488,6 +488,7 @@ int messages_get_messages_listing(void *session, const char *name,int err = -errno;DBG ("fopen(): %d, %s" , -err,strerror (-err));g_free (path); +g_free (mld);return -EBADR ; } }plugins/hostname.c +1
-2@@ -213,11 +213,10 @@ static void read_dmi_fallback(void)return ; type =atoi (contents); +g_free (contents);if (type <0 || type >0x1D )return ; -g_free (contents); -/* from systemd hostname chassis list */ switch (type) {case 0x3 :profiles/audio/avrcp.c +3
-1@@ -3508,8 +3508,10 @@ static struct avrcp_player *create_ct_player(struct avrcp *session, path =device_get_path (session->dev); mp =media_player_controller_create (path, id); -if (mp ==NULL ) +if (mp ==NULL ) { +g_free (player);return NULL ; + }media_player_set_callbacks (mp, &ct_cbs, player); player->user_data = mp;src/main.c +1
-0@@ -795,6 +795,7 @@ static void parse_config(GKeyFile *config)parse_br_config (config);parse_le_config (config); +g_free (str); }static void init_defaults (void )src/shared/shell.c +1
-0@@ -611,6 +611,7 @@ void bt_shell_prompt_input(const char *label, const char *msg, prompt->user_data = user_data;queue_push_tail (data.prompts, prompt); +g_free (str);return ; }tools/mesh-cfgclient.c +1
-1@@ -914,7 +914,7 @@ static void cmd_import_node(int argc, char *argv[])/* Number of elements */ if (sscanf (argv[4 ],"%u" , &req->arg3) !=1 ) -return ; + goto fail;/* DevKey */ req->data2 =l_util_from_hexstring (argv[5 ], &sz);tools/mesh-gatt/gatt.c +1
-0@@ -525,6 +525,7 @@ bool mesh_gatt_notify(GDBusProxy *proxy, bool enable, GDBusReturnFunction cb,notify_io_destroy ();if (cb)cb (NULL , user_data); +g_free (data);return true; }else { method ="StopNotify" ;tools/mesh-gatt/node.c +9
-4@@ -396,8 +396,10 @@ bool node_parse_composition(struct mesh_node *node, uint8_t *data, uint16_t len)uint16_t vendor_id;struct mesh_element *ele; ele =g_malloc0 (sizeof (struct mesh_element )); -if (!ele) +if (!ele) { +g_free (comp);return false; + } ele->index = i; ele->loc =get_le16 (data);@@ -412,8 +414,10 @@ bool node_parse_composition(struct mesh_node *node, uint8_t *data, uint16_t len) mod_id =get_le16 (data);/* initialize uppper 16 bits to 0xffff for SIG models */ mod_id |=0xffff0000 ; -if (!node_set_model (node, ele->index, mod_id)) +if (!node_set_model (node, ele->index, mod_id)) { +g_free (comp);return false; + } data +=2 ; len -=2 ; }@@ -421,8 +425,10 @@ bool node_parse_composition(struct mesh_node *node, uint8_t *data, uint16_t len) mod_id =get_le16 (data +2 ); vendor_id =get_le16 (data); mod_id |= (vendor_id <<16 ); -if (!node_set_model (node, ele->index, mod_id)) +if (!node_set_model (node, ele->index, mod_id)) { +g_free (comp);return false; + } data +=4 ; len -=4 ; } --2.31.1
Signature · 1 line
Luiz Augusto von Dentz
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=481423
---Test result---
Test Summary:
CheckPatch PASS 0.45 seconds GitLint PASS 0.12 seconds Prep - Setup ELL PASS 38.66 seconds Build - Prep PASS 0.10 seconds Build - Configure PASS 6.91 seconds Build - Make FAIL 9.37 seconds Make Check FAIL 0.42 seconds Make Distcheck FAIL 70.14 seconds Build w/ext ELL - Configure PASS 6.92 seconds Build w/ext ELL - Make FAIL 9.23 seconds
Details
##############################
Test: CheckPatch - PASS
Desc: Run checkpatch.pl script with rule in .checkpatch.conf
##############################
Test: GitLint - PASS
Desc: Run gitlint with rule in .gitlint
##############################
Test: Prep - Setup ELL - PASS
Desc: Clone, build, and install ELL
##############################
Test: Build - Prep - PASS
Desc: Prepare environment for build
##############################
Test: Build - Configure - PASS
Desc: Configure the BlueZ source tree
##############################
Test: Build - Make - FAIL
Desc: Build the BlueZ source tree
Output:src/shared/shell.c: In function ‘bt_shell_prompt_input’:src/shared/shell.c:614:3: error: implicit declaration of function ‘g_free’; did you mean ‘rl_free’? [-Werror=implicit-function-declaration]
614 | g_free(str);
| ^~~~~~
| rl_freecc1: all warnings being treated as errors make[1]: *** [Makefile:6947: src/shared/shell.lo] Error 1
make: *** [Makefile:4128: all] Error 2
##############################
Test: Make Check - FAIL
Desc: Run 'make check'
Output:src/shared/shell.c: In function ‘bt_shell_prompt_input’:src/shared/shell.c:614:3: error: implicit declaration of function ‘g_free’; did you mean ‘rl_free’? [-Werror=implicit-function-declaration]
614 | g_free(str);
| ^~~~~~
| rl_freecc1: all warnings being treated as errors make[1]: *** [Makefile:6947: src/shared/shell.lo] Error 1
make: *** [Makefile:10398: check] Error 2
##############################
Test: Make Distcheck - FAIL
Desc: Run distcheck to check the distribution
Output:../../src/shared/shell.c: In function ‘bt_shell_prompt_input’:../../src/shared/shell.c:614:3: warning: implicit declaration of function ‘g_free’; did you mean ‘rl_free’? [-Wimplicit-function-declaration]
614 | g_free(str);
| ^~~~~~
| rl_free/usr/bin/ld: src/.libs/libshared-ell.a(shell.o): in function `bt_shell_prompt_input':
/github/workspace/src/bluez-5.58/_build/sub/../../src/shared/shell.c:614: undefined reference to `g_free'
collect2: error: ld returned 1 exit status
make[2]: *** [Makefile:5956: tools/mesh-cfgclient] Error 1
make[1]: *** [Makefile:4128: all] Error 2
make: *** [Makefile:10319: distcheck] Error 1
##############################
Test: Build w/ext ELL - Configure - PASS
Desc: Configure BlueZ source with '--enable-external-ell' configuration
##############################
Test: Build w/ext ELL - Make - FAIL
Desc: Build BlueZ source with '--enable-external-ell' configuration
Output:src/shared/shell.c: In function ‘bt_shell_prompt_input’:src/shared/shell.c:614:3: error: implicit declaration of function ‘g_free’; did you mean ‘rl_free’? [-Werror=implicit-function-declaration]
614 | g_free(str);
| ^~~~~~
| rl_freecc1: all warnings being treated as errors make[1]: *** [Makefile:6947: src/shared/shell.lo] Error 1
make: *** [Makefile:4128: all] Error 2
---
Regards,
Linux Bluetooth
Quoted 8 lines · Steve Grubb
obexd/plugins/filesystem.c +0
-0@@ -415,7 +415,7 @@ static void *capability_open(const char *name, int oflag, mode_t mode, goto fail; }
Quoted 6 lines
- object->buffer =g_string_new(buf); + object->buffer = buf;
if (size)
*size =object->buffer->len;
Pretty certain this is wrong. It might be best to split the patch up into its individual parts so it's easier to merge the non-broken ones.
Quoted 10 lines · EDT Bastien Nocera
Quoted 9 lines · Steve Grubb
obexd/plugins/filesystem.c +0
-0@@ -415,7 +415,7 @@ static void *capability_open(const char *name, int oflag, mode_t mode, goto fail; }
Quoted 7 lines
Quoted 5 lines
obexd/plugins/filesystem.c +1
-1- object->buffer =g_string_new (buf); + object->buffer = buf;if (size)*size = object->buffer->len;Pretty certain this is wrong.
Yeah, now that you mention it...that is a GString object. I guess we g_free(buf) right after the g_string_new(). Should I resend just that one patch or do I need to regenerate all 7 emails?
-Steve
Luiz Augusto von Dentz
maintainerHi Steve,
Quoted 15 lines · Steve Grubb
Quoted 13 lines · EDT Bastien Nocera
Quoted 12 lines · Steve Grubb
obexd/plugins/filesystem.c +1
-1@@ -415,7 +415,7 @@ static void *capability_open(const char *name, int oflag, mode_t mode, goto fail; } - object->buffer =g_string_new (buf); + object->buffer = buf;
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
obexd/plugins/filesystem.c +0
-0if (size)*size = object->buffer->len;Pretty certain this is wrong.
Yeah, now that you mention it...that is a GString object. I guess we
g_free(buf)right after theg_string_new(). Should I resend just that one patch or do I need to regenerate all 7 emails?
Please resend as v7, also while at it remove the signed-off-by as we don't use that in userspace.
Signature · 1 line
Luiz Augusto von Dentz