Re: [PATCH] nfs-utils: Fix minor memory leaks before return.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On 06/20/2018 12:21 PM, Kenneth Dsouza wrote:
> Signed-off-by: Kenneth D'souza <kdsouza@xxxxxxxxxx>
> Signed-off-by: Frank Sorenson <sorenson@xxxxxxxxxx>
> ---
>  support/junction/path.c            | 4 +++-
>  support/nfsidmap/nfsidmap_common.c | 4 +++-
>  2 files changed, 6 insertions(+), 2 deletions(-)
Committed... 

steved.
> 
> diff --git a/support/junction/path.c b/support/junction/path.c
> index 68a1d13..e74e4c4 100644
> --- a/support/junction/path.c
> +++ b/support/junction/path.c
> @@ -326,8 +326,10 @@ nsdb_posix_to_path_array(const char *pathname, char ***path_array)
>  			break;
>  		next = strchrnul(component, '/');
>  		length = (size_t)(next - component);
> -		if (length > 255)
> +		if (length > 255) {
> +			nsdb_free_string_array(result);
>  			return FEDFS_ERR_SVRFAULT;
> +		}
>  
>  		result[i] = strndup(component, length);
>  		if (result[i] == NULL) {
> diff --git a/support/nfsidmap/nfsidmap_common.c b/support/nfsidmap/nfsidmap_common.c
> index 5242c7e..f89b82e 100644
> --- a/support/nfsidmap/nfsidmap_common.c
> +++ b/support/nfsidmap/nfsidmap_common.c
> @@ -57,8 +57,10 @@ struct conf_list *get_local_realms(void)
>  			return NULL;
>  
>  		node->field = calloc(1, NFS4_MAX_DOMAIN_LEN);
> -		if (node->field == NULL)
> +		if (node->field == NULL) {
> +			free(node);
>  			return NULL;
> +		}
>  
>  		nfs4_get_default_domain(NULL, node->field, NFS4_MAX_DOMAIN_LEN);
>  		toupper_str(node->field);
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Filesystem Development]     [Linux USB Development]     [Linux Media Development]     [Video for Linux]     [Linux NILFS]     [Linux Audio Users]     [Yosemite Info]     [Linux SCSI]

  Powered by Linux