[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH] tools/xenstore: fix error handling of check_store()
check_store() has an incomplete error handling: it doesn't check whether "root" allocation succeeded, and it is leaking the memory of "root" in case create_hashtable() fails. Signed-off-by: Juergen Gross <jgross@xxxxxxxx> --- tools/xenstore/xenstored_core.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index c386ae6129..91d3adccb1 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -2050,14 +2050,18 @@ static void clean_store(struct hashtable *reachable) void check_store(void) { - char * root = talloc_strdup(NULL, "/"); - struct hashtable * reachable = - create_hashtable(16, hash_from_key_fn, keys_equal_fn); - - if (!reachable) { + char *root = talloc_strdup(NULL, "/"); + struct hashtable *reachable; + + if (!root) { log("check_store: ENOMEM"); return; } + reachable = create_hashtable(16, hash_from_key_fn, keys_equal_fn); + if (!reachable) { + log("check_store: ENOMEM"); + goto out_root; + } log("Checking store ..."); if (!check_store_(root, reachable) && @@ -2067,6 +2071,7 @@ void check_store(void) hashtable_destroy(reachable, 0 /* Don't free values (they are all (void *)1) */); + out_root: talloc_free(root); } -- 2.31.1
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |