Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-09-01 22:53:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix a unionfs memory leak

Browse source
This commit is contained in:
Gregory Nutt 2015-06-06 07:58:23 -06:00
parent 257a90a686
commit 1c2374aedb
1 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
fs/unionfs/fs_unionfs.c
View file

@ -1143,7 +1143,7 @@ static int unionfs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
ret = unionfs_tryopendir(um->um_node, relpath, um->um_prefix, lowerdir);
if (ret >= 0)
{
/* Save the filsystem2 access info */
/* Save the file system 2 access info */
fu->fu_ndx = 1;
fu->fu_lower[1] = lowerdir;
@ -1165,16 +1165,29 @@ static int unionfs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
ret = unionfs_tryopendir(um->um_node, relpath, um->um_prefix, lowerdir);
if (ret >= 0)
{
/* Save the filsystem1 access info */
/* Save the file system 1 access info */
fu->fu_ndx = 0;
fu->fu_lower[0] = lowerdir;
}
else if (fu->fu_lower[1] == NULL)
else
{
/* Neither file system was opened! */
/* File system 1 was not opened... then we won't be needing that last
* localdir allocation after all.
*/
goto errout_with_lowerdir;
kmm_free(lowerdir);
/* If the directory was not found on either file system, then we have
* failed.
*/
if (fu->fu_lower[1] == NULL)
{
/* Neither file system was opened! */
goto errout_with_semaphore;
}
}
/* Increment the number of open references and return success */
@ -1195,9 +1208,6 @@ errout_with_fs2open:
kmm_free(fu->fu_lower[1]);
errout_with_lowerdir:
kmm_free(lowerdir);
errout_with_semaphore:
unionfs_semgive(ui);
return ret;