[LTP] [PATCH]: Add check for realloc failure case

[LTP] [PATCH]: Add check for realloc failure case

[Manjeet Pawar]

From: Manjeet Pawar <manjeet.p@samsung.com>
Subject: [PATCH] pan/splitstr.c: Add check for realloc failure case

This patch adds check for realloc failure case and free arg_string before returning from splitstr() to avoid memory leaks

Signed-off-by: Yogesh Gaur <yn.gaur@samsung.com>
Signed-off-by: Manjeet Pawar <manjeet.p@samsung.com>
---
 pan/splitstr.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pan/splitstr.c b/pan/splitstr.c
index 4706323..8804b15 100644
--- a/pan/splitstr.c
+++ b/pan/splitstr.c
@@ -93,6 +93,7 @@ const char **splitstr(const char *str, const char *separator, int *argcount)
 	if (arg_array == NULL) {
 		if (argcount != NULL)
 			*argcount = 0;
+		free(arg_string);
 		return (NULL);
 	}
 
@@ -110,9 +111,13 @@ const char **splitstr(const char *str, const char *separator, int *argcount)
 		cur_tok = strtok(NULL, separator);
 		if (num_toks == max_toks) {
 			max_toks += 20;
-			arg_array =
-			    (char **)realloc((void *)arg_array,
-					     sizeof(char *) * max_toks);
+			if((arg_array = realloc((void *)arg_array,sizeof(char *) * max_toks)) == NULL){
+				fprintf(stderr, "realloc: New memory allocation failed \n");
+				free(arg_array);
+				free(arg_string);
+				exit(1);
+			}
+
 		}
 	}
 	arg_array[num_toks] = NULL;
-- 
1.7.9.5
------------------------------------------------------------------------------
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH]: Add check for realloc failure case

[Cyril Hrubis]

Hi!
> @@ -110,9 +111,13 @@ const char **splitstr(const char *str, const char *separator, int *argcount)
>  		cur_tok = strtok(NULL, separator);
>  		if (num_toks == max_toks) {
>  			max_toks += 20;
> -			arg_array =
> -			    (char **)realloc((void *)arg_array,
> -					     sizeof(char *) * max_toks);
> +			if((arg_array = realloc((void *)arg_array,sizeof(char *) * max_toks)) == NULL){
> +				fprintf(stderr, "realloc: New memory allocation failed \n");
> +				free(arg_array);
> +				free(arg_string);
> +				exit(1);
> +			}
> +

These lines does not conform to LKML coding style.

There should be space before the opening curly brace '{', spaces after
coma, etc.

You can use checkpatch.pl shipped with linux kernel source to check your
patches before sending them.

-- 
Cyril Hrubis
chrubis@suse.cz

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

[LTP] [PATCH]: Add check for realloc() failure case

[Manjeet Pawar]

From: Manjeet Pawar <manjeet.p@samsung.com>
Subject: [PATCH] testcases/kernel/fs/fsstress/fsstress.c:  Add check for realloc() failure case

This patch add check for realloc failure case and exit from the testcase if realloc fails.

Signed-off-by: Manjeet Pawar <manjeet.p@samsung.com>
Signed-off-by: Yogesh Gaur <yn.gaur@samsung.com>
---
 testcases/kernel/fs/fsstress/fsstress.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/testcases/kernel/fs/fsstress/fsstress.c b/testcases/kernel/fs/fsstress/fsstress.c
index 2243280..ce74f99 100644
--- a/testcases/kernel/fs/fsstress/fsstress.c
+++ b/testcases/kernel/fs/fsstress/fsstress.c
@@ -330,8 +330,12 @@ int main(int argc, char **argv)
 			process_freq(optarg);
 			break;
 		case 'i':
-			ilist = realloc(ilist, ++ilistlen * sizeof(*ilist));
-			ilist[ilistlen - 1] = strtol(optarg, &p, 16);
+			if(realloc(ilist, ++ilistlen * sizeof(*ilist)) != NULL)
+				ilist[ilistlen - 1] = strtol(optarg, &p, 16);
+			else{
+				fprintf(stderr, "realloc: New memory allocation failed \n");
+				exit(1);
+			}
 			break;
 		case 'l':
 			loops = atoi(optarg);
-- 
1.7.9.5


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

Re: [LTP] [PATCH]: Add check for realloc() failure case

[Cyril Hrubis]

Hi!
>  		case 'i':
> -			ilist = realloc(ilist, ++ilistlen * sizeof(*ilist));
> -			ilist[ilistlen - 1] = strtol(optarg, &p, 16);
> +			if(realloc(ilist, ++ilistlen * sizeof(*ilist)) != NULL)
> +				ilist[ilistlen - 1] = strtol(optarg, &p, 16);

This code is wrong. The realloc() may return _different_ address (and
will copy the data if it does so).

> +			else{
> +				fprintf(stderr, "realloc: New memory allocation failed \n");
> +				exit(1);
> +			}
>  			break;
>  		case 'l':
>  			loops = atoi(optarg);

Also the coding style does not follow LKML.

-- 
Cyril Hrubis
chrubis@suse.cz

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

[LTP] [PATCH]: Add check for realloc() failure case

[Manjeet Pawar]

From: Manjeet Pawar <manjeet.p@samsung.com>
Subject: [PATCH] testcases/network/nfs/nfs_fsstress/fsstress.c: Add check for realloc() failure case 

This patch add check for realloc failure case and exit from the testcase if realloc fails.

Signed-off-by: Yogesh Gaur <yn.gaur@samsung.com>
Signed-off-by: Manjeet Pawar <manjeet.p@samsung.com>
---
 testcases/network/nfs/nfs_fsstress/fsstress.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/testcases/network/nfs/nfs_fsstress/fsstress.c b/testcases/network/nfs/nfs_fsstress/fsstress.c
index ac91262..208c2dc 100644
--- a/testcases/network/nfs/nfs_fsstress/fsstress.c
+++ b/testcases/network/nfs/nfs_fsstress/fsstress.c
@@ -330,8 +330,12 @@ int main(int argc, char **argv)
 			process_freq(optarg);
 			break;
 		case 'i':
-			ilist = realloc(ilist, ++ilistlen * sizeof(*ilist));
-			ilist[ilistlen - 1] = strtol(optarg, &p, 16);
+			if(realloc(ilist, ++ilistlen * sizeof(*ilist)) != NULL)
+				ilist[ilistlen - 1] = strtol(optarg, &p, 16);
+			else{
+				fprintf(stderr, "realloc: New memory allocation failed \n");
+				exit(1);
+			}
 			break;
 		case 'l':
 			loops = atoi(optarg);
-- 
1.7.9.5

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

Re: [LTP] [PATCH]: Add check for realloc failure case

[Cyril Hrubis]

Hi!
> @@ -113,6 +114,12 @@ const char **splitstr(const char *str, const char *separator, int *argcount)
>  			arg_array =
>  			    (char **)realloc((void *)arg_array,
>  					     sizeof(char *) * max_toks);
> +			if (arg_array == NULL) {
> +				fprintf(stderr, "realloc: New memory allocation failed \n");
> +				free(arg_array);

I've removed the free(arg_array) here, because it's noop (doing free(NULL)) and pushed both patches.

-- 
Cyril Hrubis
chrubis@suse.cz

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