patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

subsys/fs/fatfs: Fix missing memory free on error

Browse source 
fatfs_open and fatfs_opendir fail to free reserved memory on error
which may lead to memory exhaustion, when too many file/dir open errors
are caused, and will cause all subsequent open attempts to fail with
ENOMEM error.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
This commit is contained in:
Dominik Ermel 2020-06-24 13:52:54 +00:00 committed by Carles Cufí
parent 0b1af81daa
commit 4c122dd42a
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
subsys/fs/fat_fs.c
View file

@ -80,6 +80,11 @@ static int fatfs_open(struct fs_file_t *zfp, const char *file_name)
res = f_open(zfp->filep, &file_name[1], fs_mode);
if (res != FR_OK) {
k_mem_slab_free(&fatfs_filep_pool, &ptr);
zfp->filep = NULL;
}
return translate_error(res);
}
@ -91,6 +96,7 @@ static int fatfs_close(struct fs_file_t *zfp)
/* Free file ptr memory */
k_mem_slab_free(&fatfs_filep_pool, &zfp->filep);
zfp->filep = NULL;
return translate_error(res);
}
@ -257,9 +263,13 @@ static int fatfs_opendir(struct fs_dir_t *zdp, const char *path)
return -ENOMEM;
}
res = f_opendir(zdp->dirp, &path[1]);
if (res != FR_OK) {
k_mem_slab_free(&fatfs_dirp_pool, &ptr);
zdp->dirp = NULL;
}
return translate_error(res);
}