diff options
| author | NeilBrown <neilb@suse.com> | 2016-12-06 13:07:14 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2016-12-20 13:29:04 -0500 |
| commit | 8a051f2eefa9eeb034ffbff567b645c367d4a4e4 (patch) | |
| tree | 599a1885df77317620c7633fd4db3e1c8511d1cd | |
| parent | a834c67ad9eecfbccd068c4917345499f6c911a7 (diff) | |
| download | nfs-utils-8a051f2eefa9eeb034ffbff567b645c367d4a4e4.tar.gz | |
conffile: free image of config file after parsing
conffile allocates memory and reads in the config file.
It then parses the file, using strdup() to take a copy of
any string that it uses, so after conf_parse() there are no
references in to the allocated file image.
conffile does not free this image. It keeps a pointer, but never uses
it in an interesing way, and never frees it. This is a little clumsy
and interfers with a future patch which will support the inclusion of
subordinate config files.
So free 'new_conf_addr' when finished with it, and discard the
'conf_addr' variable that stored it.
This has an insignificant performance consequence in that we node
always free everything in the hash table, even when we know it must
be empty.
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | support/nfs/conffile.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c index 609d782..e459750 100644 --- a/support/nfs/conffile.c +++ b/support/nfs/conffile.c @@ -107,8 +107,6 @@ struct conf_binding { char *conf_path; LIST_HEAD (conf_bindings, conf_binding) conf_bindings[256]; -static char *conf_addr; - static __inline__ uint8_t conf_hash(char *s) { @@ -396,7 +394,7 @@ conf_reinit(void) /* XXX I assume short reads won't happen here. */ if (read (fd, new_conf_addr, sz) != (int)sz) { xlog_warn("conf_reinit: read (%d, %p, %lu) failed", - fd, new_conf_addr, (unsigned long)sz); + fd, new_conf_addr, (unsigned long)sz); goto fail; } close(fd); @@ -404,6 +402,7 @@ conf_reinit(void) trans = conf_begin(); /* XXX Should we not care about errors and rollback? */ conf_parse(trans, new_conf_addr, sz); + free(new_conf_addr); } else trans = conf_begin(); @@ -412,17 +411,13 @@ conf_reinit(void) conf_load_defaults(); /* Free potential existing configuration. */ - if (conf_addr) { - for (i = 0; i < sizeof conf_bindings / sizeof conf_bindings[0]; i++) { - cb = LIST_FIRST (&conf_bindings[i]); - for (; cb; cb = LIST_FIRST (&conf_bindings[i])) - conf_remove_now(cb->section, cb->tag); - } - free (conf_addr); + for (i = 0; i < sizeof conf_bindings / sizeof conf_bindings[0]; i++) { + cb = LIST_FIRST (&conf_bindings[i]); + for (; cb; cb = LIST_FIRST (&conf_bindings[i])) + conf_remove_now(cb->section, cb->tag); } conf_end(trans, 1); - conf_addr = new_conf_addr; return; fail: |