LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fs: fat: Fix possible double free of fatbuf 

fat_itr_root() allocates fatbuf so we free it on the exit path, if
the function fails we should not free it, check the return value
and skip freeing if the function fails.

Signed-off-by: Andrew F. Davis <afd@ti.com>
This commit is contained in:
Andrew F. Davis 2019-05-16 09:34:31 -05:00 committed by Tom Rini
parent 7b437807ee
commit d0cd30eb81
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/fat/fat.c
View File

@ -1134,11 +1134,12 @@ int fat_size(const char *filename, loff_t *size)
* expected to fail if passed a directory path:
*/
free(fsdata.fatbuf);
fat_itr_root(itr, &fsdata);
if (!fat_itr_resolve(itr, filename, TYPE_DIR)) {
ret = fat_itr_root(itr, &fsdata);
if (ret)
goto out_free_itr;
ret = fat_itr_resolve(itr, filename, TYPE_DIR);
if (!ret)
*size = 0;
ret = 0;
}
goto out_free_both;
}