From: Marco Schlumpp <marco@unikraft.io>
Date: Wed, 26 Jul 2023 10:43:25 +0000 (+0200)
Subject: lib/posix-event: Use correct allocator for vfscore_file
X-Git-Tag: RELEASE-0.14.0~229
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=99d938094e15c4790fdcbc90c58aa1662a25a626;p=unikraft%2Funikraft.git

lib/posix-event: Use correct allocator for vfscore_file

Same reasoning as in the previous commit.

Signed-off-by: Marco Schlumpp <marco@unikraft.io>
Reviewed-by: Tu Dinh Ngoc <dinhngoc.tu@irit.fr>
Reviewed-by: Eduard Vintilă <eduard.vintila47@gmail.com>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #1000
---

diff --git a/lib/posix-event/epoll.c b/lib/posix-event/epoll.c
index 6a7b57add..707ca91e0 100644
--- a/lib/posix-event/epoll.c
+++ b/lib/posix-event/epoll.c
@@ -130,7 +130,7 @@ static int do_epoll_create(struct uk_alloc *a, int flags)
 		goto ERR_MALLOC_FILE;
 	}
 
-	vfs_file = uk_malloc(a, sizeof(struct vfscore_file));
+	vfs_file = malloc(sizeof(struct vfscore_file));
 	if (unlikely(!vfs_file)) {
 		ret = -ENOMEM;
 		goto ERR_MALLOC_VFS_FILE;
@@ -185,7 +185,7 @@ ERR_VFS_INSTALL:
 ERR_ALLOC_DENTRY:
 	vput(vfs_vnode);
 ERR_ALLOC_VNODE:
-	uk_free(a, vfs_file);
+	free(vfs_file);
 ERR_MALLOC_VFS_FILE:
 	uk_free(a, ep);
 ERR_MALLOC_FILE:
diff --git a/lib/posix-event/eventfd.c b/lib/posix-event/eventfd.c
index ab1e324d6..d8c911b49 100644
--- a/lib/posix-event/eventfd.c
+++ b/lib/posix-event/eventfd.c
@@ -364,7 +364,7 @@ static int do_eventfd(struct uk_alloc *a, unsigned int initval, int flags)
 		goto ERR_MALLOC_FILE;
 	}
 
-	vfs_file = uk_malloc(a, sizeof(struct vfscore_file));
+	vfs_file = malloc(sizeof(struct vfscore_file));
 	if (unlikely(!vfs_file)) {
 		ret = -ENOMEM;
 		goto ERR_MALLOC_VFS_FILE;
@@ -427,7 +427,7 @@ ERR_VFS_INSTALL:
 ERR_ALLOC_DENTRY:
 	vput(vfs_vnode);
 ERR_ALLOC_VNODE:
-	uk_free(a, vfs_file);
+	free(vfs_file);
 ERR_MALLOC_VFS_FILE:
 	uk_free(a, efd);
 ERR_MALLOC_FILE: