* [PATCH] nfs-utils: Fix minor memory leaks before return.
@ 2018-06-20 16:21 Kenneth Dsouza
2018-06-25 15:37 ` Steve Dickson
0 siblings, 1 reply; 2+ messages in thread
From: Kenneth Dsouza @ 2018-06-20 16:21 UTC (permalink / raw)
To: linux-nfs; +Cc: steved, sorenson
Signed-off-by: Kenneth D'souza <kdsouza@redhat.com>
Signed-off-by: Frank Sorenson <sorenson@redhat.com>
---
support/junction/path.c | 4 +++-
support/nfsidmap/nfsidmap_common.c | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
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);
--
2.14.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] nfs-utils: Fix minor memory leaks before return.
2018-06-20 16:21 [PATCH] nfs-utils: Fix minor memory leaks before return Kenneth Dsouza
@ 2018-06-25 15:37 ` Steve Dickson
0 siblings, 0 replies; 2+ messages in thread
From: Steve Dickson @ 2018-06-25 15:37 UTC (permalink / raw)
To: Kenneth Dsouza, linux-nfs; +Cc: sorenson
On 06/20/2018 12:21 PM, Kenneth Dsouza wrote:
> Signed-off-by: Kenneth D'souza <kdsouza@redhat.com>
> Signed-off-by: Frank Sorenson <sorenson@redhat.com>
> ---
> 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);
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-06-25 15:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-20 16:21 [PATCH] nfs-utils: Fix minor memory leaks before return Kenneth Dsouza
2018-06-25 15:37 ` Steve Dickson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).