[Skiboot] [PATCH] secvar/secvar_util: Properly free memory on zalloc fail

Nick Child nnac123 at gmail.com
Thu Apr 22 06:05:45 AEST 2021

If allocating the secure variable name of a secure variable struct,
`secvar->key`, fails then the secvar struct should be freed before
returning NULL. Previously, if this allocation fails, then only the
`secvar->key` is freed (which is likely a typo) leaving the allocated
`secvar` struct allocated and returning NULL. This memory leak can be
seen with the static analysis tool `cppcheck`. After running valgrind
tests, this commit ensures that memory is properly freed if an error
occurs when allocating the `key` field of the `secvar` struct.

Signed-off-by: Nick Child <nick.child at ibm.com>
 libstb/secvar/secvar_util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libstb/secvar/secvar_util.c b/libstb/secvar/secvar_util.c
index 533170a3..d14a9a53 100644
--- a/libstb/secvar/secvar_util.c
+++ b/libstb/secvar/secvar_util.c
@@ -49,7 +49,7 @@ struct secvar *alloc_secvar(uint64_t key_len, uint64_t data_size)
 	ret->key = zalloc(key_len);
 	if (!ret->key) {
-		free(ret->key);
+		free(ret);
 		return NULL;

More information about the Skiboot mailing list