clearlinux/graphene
2
0
Fork 0
mirror of https://github.com/clearlinux/graphene.git synced 2026-09-05 21:31:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PAL] Correct memory allocation in file_rename() and dir_rename()

Browse Source 
Use strdup() to correctly copy a string with NULL termination.
Prevent memory leak by freeing {file,dir}.realpath when needed.
This commit is contained in:
Gary
2019-05-07 16:41:53 -07:00
committed by Dmitrii Kuvaiskii
parent 5992881c46
commit 4ae620f87b
3 changed files with 104 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pal/src/host/FreeBSD/db_files.c
+34 -9
View File
@@ -130,10 +130,11 @@ static int file_close (PAL_HANDLE handle)
int ret = INLINE_SYSCALL(close, 1, fd);
/* initial realpath is part of handle object and will be freed with it */
if (handle->file.realpath &&
handle->file.realpath != (void *) handle + HANDLE_SIZE(file))
handle->file.realpath != (void *) handle + HANDLE_SIZE(file)) {
free((void *) handle->file.realpath);
}
return IS_ERR(ret) ? unix_to_pal_error(ERRNO(ret)) : 0;
}
@@ -270,12 +271,23 @@ static int file_attrsetbyhdl (PAL_HANDLE handle,
static int file_rename (PAL_HANDLE handle, const char * type,
const char * uri)
{
char* tmp = strdup(uri);
if (!tmp)
return -PAL_ERROR_NOMEM;
int ret = INLINE_SYSCALL(rename, 2, handle->file.realpath, uri);
if (IS_ERR(ret))
if (IS_ERR(ret)) {
free(tmp);
return unix_to_pal_error(ERRNO(ret));
}
handle->file.realpath = malloc_copy(uri, strlen(uri));
/* initial realpath is part of handle object and will be freed with it */
if (handle->file.realpath &&
handle->file.realpath != (void *) handle + HANDLE_SIZE(file)) {
free((void *) handle->file.realpath);
}
handle->file.realpath = tmp;
return 0;
}
@@ -459,9 +471,11 @@ static int dir_close (PAL_HANDLE handle)
handle->dir.buf = handle->dir.ptr = handle->dir.end = NULL;
}
/* initial realpath is part of handle object and will be freed with it */
if (handle->dir.realpath &&
handle->dir.realpath != (void *) handle + HANDLE_SIZE(dir))
handle->dir.realpath != (void *) handle + HANDLE_SIZE(dir)) {
free((void *) handle->dir.realpath);
}
if (IS_ERR(ret))
return -PAL_ERROR_BADHANDLE;
@@ -489,12 +503,23 @@ static int dir_delete (PAL_HANDLE handle, int access)
static int dir_rename (PAL_HANDLE handle, const char * type,
const char * uri)
{
char* tmp = strdup(uri);
if (!tmp)
return -PAL_ERROR_NOMEM;
int ret = INLINE_SYSCALL(rename, 2, handle->dir.realpath, uri);
if (IS_ERR(ret))
if (IS_ERR(ret)) {
free(tmp);
return unix_to_pal_error(ERRNO(ret));
}
handle->dir.realpath = malloc_copy(uri, strlen(uri));
/* initial realpath is part of handle object and will be freed with it */
if (handle->dir.realpath &&
handle->dir.realpath != (void *) handle + HANDLE_SIZE(dir)) {
free((void *) handle->dir.realpath);
}
handle->dir.realpath = tmp;
return 0;
}
Pal/src/host/Linux-SGX/db_files.c
+36 -12
View File
@@ -165,6 +165,7 @@ static int file_close (PAL_HANDLE handle)
int fd = handle->file.fd;
ocall_close(fd);
/* initial realpath is part of handle object and will be freed with it */
if (handle->file.realpath &&
handle->file.realpath != (void *) handle + HANDLE_SIZE(file))
free((void *) handle->file.realpath);
@@ -356,13 +357,24 @@ static int file_rename (PAL_HANDLE handle, const char * type,
{
if (!strcmp_static(type, "file"))
return -PAL_ERROR_INVAL;
int ret = ocall_rename(handle->file.realpath, uri);
if (IS_ERR(ret))
return unix_to_pal_error(ERRNO(ret));
/* TODO: old realpath memory is potentially leaked here, and need
* to check for strdup memory allocation failure. */
handle->file.realpath = strdup(uri);
char* tmp = strdup(uri);
if (!tmp)
return -PAL_ERROR_NOMEM;
int ret = ocall_rename(handle->file.realpath, uri);
if (IS_ERR(ret)) {
free(tmp);
return unix_to_pal_error(ERRNO(ret));
}
/* initial realpath is part of handle object and will be freed with it */
if (handle->file.realpath &&
handle->file.realpath != (void *) handle + HANDLE_SIZE(file)) {
free((void *) handle->file.realpath);
}
handle->file.realpath = tmp;
return 0;
}
@@ -533,6 +545,7 @@ static int dir_close (PAL_HANDLE handle)
handle->dir.buf = handle->dir.ptr = handle->dir.end = (PAL_PTR) NULL;
}
/* initial realpath is part of handle object and will be freed with it */
if (handle->dir.realpath &&
handle->dir.realpath != (void *) handle + HANDLE_SIZE(dir))
free((void *) handle->dir.realpath);
@@ -559,13 +572,24 @@ static int dir_rename (PAL_HANDLE handle, const char * type,
{
if (!strcmp_static(type, "dir"))
return -PAL_ERROR_INVAL;
int ret = ocall_rename(handle->dir.realpath, uri);
if (IS_ERR(ret))
return unix_to_pal_error(ERRNO(ret));
/* TODO: old realpath memory is potentially leaked here, and need
* to check for strdup memory allocation failure. */
handle->dir.realpath = strdup(uri);
char* tmp = strdup(uri);
if (!tmp)
return -PAL_ERROR_NOMEM;
int ret = ocall_rename(handle->dir.realpath, uri);
if (IS_ERR(ret)) {
free(tmp);
return unix_to_pal_error(ERRNO(ret));
}
/* initial realpath is part of handle object and will be freed with it */
if (handle->dir.realpath &&
handle->dir.realpath != (void *) handle + HANDLE_SIZE(dir)) {
free((void *) handle->dir.realpath);
}
handle->dir.realpath = tmp;
return 0;
}
Pal/src/host/Linux/db_files.c
+34 -8
View File
@@ -133,9 +133,11 @@ static int file_close (PAL_HANDLE handle)
int ret = INLINE_SYSCALL(close, 1, fd);
/* initial realpath is part of handle object and will be freed with it */
if (handle->file.realpath &&
handle->file.realpath != (void *) handle + HANDLE_SIZE(file))
handle->file.realpath != (void *) handle + HANDLE_SIZE(file)) {
free((void *) handle->file.realpath);
}
return IS_ERR(ret) ? unix_to_pal_error(ERRNO(ret)) : 0;
}
@@ -288,12 +290,23 @@ static int file_rename (PAL_HANDLE handle, const char * type,
if (!strcmp_static(type, "file"))
return -PAL_ERROR_INVAL;
char* tmp = strdup(uri);
if (!tmp)
return -PAL_ERROR_NOMEM;
int ret = INLINE_SYSCALL(rename, 2, handle->file.realpath, uri);
if (IS_ERR(ret))
if (IS_ERR(ret)) {
free(tmp);
return unix_to_pal_error(ERRNO(ret));
}
handle->file.realpath = malloc_copy(uri, strlen(uri));
/* initial realpath is part of handle object and will be freed with it */
if (handle->file.realpath &&
handle->file.realpath != (void *) handle + HANDLE_SIZE(file)) {
free((void *) handle->file.realpath);
}
handle->file.realpath = tmp;
return 0;
}
@@ -484,9 +497,11 @@ static int dir_close (PAL_HANDLE handle)
handle->dir.buf = handle->dir.ptr = handle->dir.end = (PAL_PTR) NULL;
}
/* initial realpath is part of handle object and will be freed with it */
if (handle->dir.realpath &&
handle->dir.realpath != (void *) handle + HANDLE_SIZE(dir))
handle->dir.realpath != (void *) handle + HANDLE_SIZE(dir)) {
free((void *) handle->dir.realpath);
}
if (IS_ERR(ret))
return -PAL_ERROR_BADHANDLE;
@@ -517,12 +532,23 @@ static int dir_rename (PAL_HANDLE handle, const char * type,
if (!strcmp_static(type, "dir"))
return -PAL_ERROR_INVAL;
char* tmp = strdup(uri);
if (!tmp)
return -PAL_ERROR_NOMEM;
int ret = INLINE_SYSCALL(rename, 2, handle->dir.realpath, uri);
if (IS_ERR(ret))
if (IS_ERR(ret)) {
free(tmp);
return unix_to_pal_error(ERRNO(ret));
}
handle->dir.realpath = malloc_copy(uri, strlen(uri));
/* initial realpath is part of handle object and will be freed with it */
if (handle->dir.realpath &&
handle->dir.realpath != (void *) handle + HANDLE_SIZE(dir)) {
free((void *) handle->dir.realpath);
}
handle->dir.realpath = tmp;
return 0;
}