[LTP] [PATCH]: Fix memory leak

[LTP] [PATCH]: Fix memory leak

[Manjeet Pawar]

From: Manjeet Pawar <manjeet.p@samsung.com>
Subject: [PATCH] utils/sctp/testlib/sctputil.c: Fix memory leak

This patch frees the allocated memory (used for checking peer addresses) before returning from function.

Signed-off-by: Akhilesh Kumar <akhilesh.k@samsung.com>
Signed-off-by: Manjeet Pawar <manjeet.p@samsung.com>
---
 utils/sctp/testlib/sctputil.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/utils/sctp/testlib/sctputil.c b/utils/sctp/testlib/sctputil.c
index c670af6..283b5a7 100644
--- a/utils/sctp/testlib/sctputil.c
+++ b/utils/sctp/testlib/sctputil.c
@@ -376,6 +376,7 @@ int test_peer_addr(int sk, sctp_assoc_t asoc, sockaddr_storage_t *peers, int cou
 	error = sctp_getpaddrs(sk, asoc, &addrs);
 	if (-1 == error) {
 		tst_brkm(TBROK, tst_exit, "sctp_getpaddrs: %s", strerror(errno));
+		free(found);
 		return error;
 	}
 	if (error != count) {
@@ -399,6 +400,7 @@ int test_peer_addr(int sk, sctp_assoc_t asoc, sockaddr_storage_t *peers, int cou
 			errno = EINVAL;
 			sctp_freepaddrs(addrs);
 			tst_brkm(TBROK, tst_exit, "sctp_getpaddrs: %s", strerror(errno));
+			free(found);
 			return -1;
 		}
 		for (j = 0; j < count; j++) {
@@ -414,5 +416,6 @@ int test_peer_addr(int sk, sctp_assoc_t asoc, sockaddr_storage_t *peers, int cou
 		}
 	}
 	sctp_freepaddrs(addrs);
+	free(found);
 	return 0;
 }
-- 
1.7.1

------------------------------------------------------------------------------
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH]: Fix memory leak

[Cyril Hrubis]

Hi!
There is also missing check for the return from malloc().

And given that we do not return the pointer to the array and that the
cound is at most 6, what about changing the malloc() to array on stack?

I.e.

- char *found = (char *) malloc(count);
- memset(found, 0, count);
+ char found[count];

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH]: Fix memory leak

[Cyril Hrubis]

Hi!
> This patch make 'found' a static array to avoid memory leaks.
> 
> Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
> Signed-off-by: Manjeet Pawar <manjeet.p@samsung.com>
> ---
>  utils/sctp/testlib/sctputil.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/utils/sctp/testlib/sctputil.c b/utils/sctp/testlib/sctputil.c
> index c670af6..e7333e5 100644
> --- a/utils/sctp/testlib/sctputil.c
> +++ b/utils/sctp/testlib/sctputil.c
> @@ -370,8 +370,7 @@ int test_peer_addr(int sk, sctp_assoc_t asoc, sockaddr_storage_t *peers, int cou
>  	struct sockaddr *sa_addr;
>  	socklen_t addrs_size = 0;
>  	void *addrbuf;
> -	char *found = (char *) malloc(count);
> -	memset(found, 0, count);
> +	char found[count];
>  
>  	error = sctp_getpaddrs(sk, asoc, &addrs);
>  	if (-1 == error) {

I've added initialization to 0 to the else branch down below, since we
removed the memset and pushed, thanks.

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH]: Fix memory leak

[Cyril Hrubis]

Hi!
No HTML emails please.

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list