From a0de1fe7c1bfca533e189b36c4cd3792d15821df Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Thu, 18 Oct 2018 16:36:55 +0200 Subject: mkfs.ubifs: Free all index entry names ...and make valgrind memcheck happy Signed-off-by: Richard Weinberger Signed-off-by: David Oberhollenzer --- ubifs-utils/mkfs.ubifs/mkfs.ubifs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c index 8aba668..66ca061 100644 --- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c +++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c @@ -1253,7 +1253,7 @@ static int add_xattr(struct ubifs_ino_node *host_ino, struct stat *st, ino_t inu if (data_len) memcpy(&ino->data, data, data_len); - ret = add_node(&nkey, nm.name, nm.len, ino, UBIFS_INO_NODE_SZ + data_len) ; + ret = add_node(&nkey, NULL, 0, ino, UBIFS_INO_NODE_SZ + data_len); out: free(xent); @@ -1447,7 +1447,7 @@ static int set_fscrypt_context(struct ubifs_ino_node *host_ino, ino_t inum, struct fscrypt_context *fctx) { return add_xattr(host_ino, host_st, inum, - UBIFS_XATTR_NAME_ENCRYPTION_CONTEXT, + xstrdup(UBIFS_XATTR_NAME_ENCRYPTION_CONTEXT), fctx, sizeof(*fctx)); } @@ -2470,8 +2470,10 @@ static int write_index(void) } /* Free stuff */ - for (i = 0; i < idx_cnt; i++) + for (i = 0; i < idx_cnt; i++) { + free(idx_ptr[i]->name); free(idx_ptr[i]); + } free(idx_ptr); free(idx); -- cgit v1.2.3