All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/1] adapter: Fix memory leak
@ 2016-02-03 14:58 Syam Sidhardhan
  0 siblings, 0 replies; 3+ messages in thread
From: Syam Sidhardhan @ 2016-02-03 14:58 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: syamsidhardh, Syam Sidhardhan

if strlen(str) < 32 then there is a memory leak.
---
 src/adapter.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/adapter.c b/src/adapter.c
index b184eed..f4fbf82 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -3091,12 +3091,12 @@ static GSList *get_ltk_info(GKeyFile *key_file, const char *peer,
 static struct irk_info *get_irk_info(GKeyFile *key_file, const char *peer,
 							uint8_t bdaddr_type)
 {
-	struct irk_info *irk;
+	struct irk_info *irk = NULL;
 	char *str;
 
 	str = g_key_file_get_string(key_file, "IdentityResolvingKey", "Key", NULL);
 	if (!str || strlen(str) < 32)
-		return NULL;
+		goto failed;
 
 	irk = g_new0(struct irk_info, 1);
 
@@ -3108,6 +3108,7 @@ static struct irk_info *get_irk_info(GKeyFile *key_file, const char *peer,
 	else
 		str2buf(&str[0], irk->val, sizeof(irk->val));
 
+failed:
 	g_free(str);
 
 	return irk;
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] adapter: Fix memory leak
  2016-02-08 15:02 SYAM SIDHARDHAN
@ 2016-02-11 14:14 ` Luiz Augusto von Dentz
  0 siblings, 0 replies; 3+ messages in thread
From: Luiz Augusto von Dentz @ 2016-02-11 14:14 UTC (permalink / raw)
  To: Syam Sidhardhan; +Cc: linux-bluetooth, syamsidhardh

Hi Syam,

On Mon, Feb 8, 2016 at 5:02 PM, SYAM SIDHARDHAN <s.syam@samsung.com> wrote:
>
> Hi,
> ------- Original Message -------
> Sender : SYAM SIDHARDHAN<s.syam@samsung.com> ./Senior Chief Engineer/SRI-Bangalore-System & Connectivity/Samsung Electronics
> Date : Feb 03, 2016 20:28 (GMT+05:30)
> Title : [PATCH 1/1] adapter: Fix memory leak
>
> if strlen(str) < 32 then there is a memory leak.
> ---
> src/adapter.c |    5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/src/adapter.c b/src/adapter.c
> index b184eed..f4fbf82 100644
> --- a/src/adapter.c
> +++ b/src/adapter.c
> @@ -3091,12 +3091,12 @@ static GSList *get_ltk_info(GKeyFile *key_file, const char *peer,
> static struct irk_info *get_irk_info(GKeyFile *key_file, const char *peer,
> uint8_t bdaddr_type)
> {
> - struct irk_info *irk;
> + struct irk_info *irk = NULL;
> char *str;
>
> str = g_key_file_get_string(key_file, "IdentityResolvingKey", "Key", NULL);
> if (!str || strlen(str) < 32)
> - return NULL;
> + goto failed;
>
> irk = g_new0(struct irk_info, 1);
>
> @@ -3108,6 +3108,7 @@ static struct irk_info *get_irk_info(GKeyFile *key_file, const char *peer,
> else
> str2buf(&str[0], irk->val, sizeof(irk->val));
>
> +failed:
> g_free(str);
>
> return irk;
> --
> 1.7.9.5
>

Applied, thanks.


-- 
Luiz Augusto von Dentz

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] adapter: Fix memory leak
@ 2016-02-08 15:02 SYAM SIDHARDHAN
  2016-02-11 14:14 ` Luiz Augusto von Dentz
  0 siblings, 1 reply; 3+ messages in thread
From: SYAM SIDHARDHAN @ 2016-02-08 15:02 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: syamsidhardh

DQpIaSwNCi0tLS0tLS0gT3JpZ2luYWwgTWVzc2FnZSAtLS0tLS0tDQpTZW5kZXIgOiBTWUFNIFNJ
REhBUkRIQU48cy5zeWFtQHNhbXN1bmcuY29tPiAuL1NlbmlvciBDaGllZiBFbmdpbmVlci9TUkkt
QmFuZ2Fsb3JlLVN5c3RlbSAmIENvbm5lY3Rpdml0eS9TYW1zdW5nIEVsZWN0cm9uaWNzDQpEYXRl
IDogRmViIDAzLCAyMDE2IDIwOjI4IChHTVQrMDU6MzApDQpUaXRsZSA6IFtQQVRDSCAxLzFdIGFk
YXB0ZXI6IEZpeCBtZW1vcnkgbGVhaw0KDQppZiBzdHJsZW4oc3RyKSA8IDMyIHRoZW4gdGhlcmUg
aXMgYSBtZW1vcnkgbGVhay4NCi0tLQ0Kc3JjL2FkYXB0ZXIuYyB8ICAgIDUgKysrLS0NCjEgZmls
ZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pDQoNCmRpZmYgLS1naXQg
YS9zcmMvYWRhcHRlci5jIGIvc3JjL2FkYXB0ZXIuYw0KaW5kZXggYjE4NGVlZC4uZjRmYmY4MiAx
MDA2NDQNCi0tLSBhL3NyYy9hZGFwdGVyLmMNCisrKyBiL3NyYy9hZGFwdGVyLmMNCkBAIC0zMDkx
LDEyICszMDkxLDEyIEBAIHN0YXRpYyBHU0xpc3QgKmdldF9sdGtfaW5mbyhHS2V5RmlsZSAqa2V5
X2ZpbGUsIGNvbnN0IGNoYXIgKnBlZXIsDQpzdGF0aWMgc3RydWN0IGlya19pbmZvICpnZXRfaXJr
X2luZm8oR0tleUZpbGUgKmtleV9maWxlLCBjb25zdCBjaGFyICpwZWVyLA0KdWludDhfdCBiZGFk
ZHJfdHlwZSkNCnsNCi0gc3RydWN0IGlya19pbmZvICppcms7DQorIHN0cnVjdCBpcmtfaW5mbyAq
aXJrID0gTlVMTDsNCmNoYXIgKnN0cjsNCg0Kc3RyID0gZ19rZXlfZmlsZV9nZXRfc3RyaW5nKGtl
eV9maWxlLCAiSWRlbnRpdHlSZXNvbHZpbmdLZXkiLCAiS2V5IiwgTlVMTCk7DQppZiAoIXN0ciB8
fCBzdHJsZW4oc3RyKSA8IDMyKQ0KLSByZXR1cm4gTlVMTDsNCisgZ290byBmYWlsZWQ7DQoNCmly
ayA9IGdfbmV3MChzdHJ1Y3QgaXJrX2luZm8sIDEpOw0KDQpAQCAtMzEwOCw2ICszMTA4LDcgQEAg
c3RhdGljIHN0cnVjdCBpcmtfaW5mbyAqZ2V0X2lya19pbmZvKEdLZXlGaWxlICprZXlfZmlsZSwg
Y29uc3QgY2hhciAqcGVlciwNCmVsc2UNCnN0cjJidWYoJnN0clswXSwgaXJrLT52YWwsIHNpemVv
ZihpcmstPnZhbCkpOw0KDQorZmFpbGVkOg0KZ19mcmVlKHN0cik7DQoNCnJldHVybiBpcms7DQot
LSANCjEuNy45LjUNCg0KUGluZw==



^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-02-11 14:14 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-03 14:58 [PATCH 1/1] adapter: Fix memory leak Syam Sidhardhan
2016-02-08 15:02 SYAM SIDHARDHAN
2016-02-11 14:14 ` Luiz Augusto von Dentz

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.