qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: fs/fat: Check malloc return values and fix memory leaks 

Check malloc() return values and properly unwind on errors so
memory allocated for fat_itr structures get freed properly.

Also fixes a leak of fsdata.fatbuf in fat_size().

Fixes: 2460098cffacd1 ("fs/fat: Reduce stack usage")
Change-Id: If2abd822a136b40375f6b0052c88c0d9deb3a632
Reported-by: Coverity (CID: 167225, 167233, 167234)
Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Reviewed-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit af609e3764ea3ed7c0ccad8e57f9d9671c81c3e8)
This commit is contained in:
Tuomas Tynkkynen 2017-10-01 02:25:22 +03:00 committed by Kever Yang
parent 86597fe052
commit 635356e554
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fs/fat/fat.c
View File

@ -1038,12 +1038,15 @@ int fat_exists(const char *filename)
int ret;
itr = malloc_cache_aligned(sizeof(fat_itr));
if (!itr)
return 0;
ret = fat_itr_root(itr, &fsdata);
if (ret)
return 0;
goto out;
ret = fat_itr_resolve(itr, filename, TYPE_ANY);
free(fsdata.fatbuf);
out:
free(itr);
return ret == 0;
}
@ -1055,9 +1058,11 @@ int fat_size(const char *filename, loff_t *size)
int ret;
itr = malloc_cache_aligned(sizeof(fat_itr));
if (!itr)
return -ENOMEM;
ret = fat_itr_root(itr, &fsdata);
if (ret)
return ret;
goto out_free_itr;
ret = fat_itr_resolve(itr, filename, TYPE_FILE);
if (ret) {
@ -1071,12 +1076,13 @@ int fat_size(const char *filename, loff_t *size)
*size = 0;
ret = 0;
}
goto out;
goto out_free_both;
}
*size = FAT2CPU32(itr->dent->size);
out_free_both:
free(fsdata.fatbuf);
out:
out_free_itr:
free(itr);
return ret;
}
@ -1089,19 +1095,22 @@ int file_fat_read_at(const char *filename, loff_t pos, void *buffer,
int ret;
itr = malloc_cache_aligned(sizeof(fat_itr));
if (!itr)
return -ENOMEM;
ret = fat_itr_root(itr, &fsdata);
if (ret)
return ret;
goto out_free_itr;
ret = fat_itr_resolve(itr, filename, TYPE_FILE);
if (ret)
goto out;
goto out_free_both;
printf("reading %s\n", filename);
ret = get_contents(&fsdata, itr->dent, pos, buffer, maxsize, actread);
out:
out_free_both:
free(fsdata.fatbuf);
out_free_itr:
free(itr);
return ret;
}
@ -1147,17 +1156,18 @@ int fat_opendir(const char *filename, struct fs_dir_stream **dirsp)
ret = fat_itr_root(&dir->itr, &dir->fsdata);
if (ret)
goto fail;
goto fail_free_dir;
ret = fat_itr_resolve(&dir->itr, filename, TYPE_DIR);
if (ret)
goto fail;
goto fail_free_both;
*dirsp = (struct fs_dir_stream *)dir;
return 0;
fail:
fail_free_both:
free(dir->fsdata.fatbuf);
fail_free_dir:
free(dir);
return ret;
}