mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-03-11 11:38:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ipq807x: fat: Fix overflow issue

Browse source 
As per FAT spec, the number of sectors can be more than
clusters, as clusters starts from databegin.
So check cluster overflow against total clusters.

The FAT at present in u-boot lacks a lot, such as
support for long file names, subdir etc.
The mini dump was using more than 8 character name,
changed that one too.

Change-Id: Icfae6d955dd93432b3d33d7c0b9a724382d87185
Signed-off-by: Manoharan Vijaya Raghavan <mraghava@codeaurora.org>
This commit is contained in:
Manoharan Vijaya Raghavan 2019-08-11 17:07:24 +05:30
parent 9a5d372d14
commit 8791ff3dab
3 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
board/qca/arm/common/crashdump.c
View file

@ -373,7 +373,7 @@ static int dump_wlan_segments(struct dumpinfo_t *dumpinfo, int indx)
if (cur_type == QCA_WDT_LOG_DUMP_TYPE_WLAN_MOD_INFO) {
snprintf(wlan_segment_name, sizeof(wlan_segment_name),
"MODULE_INFO.txt");
"MOD_INFO.txt");
wlan_tlv_size = *(uint32_t *)(uintptr_t)tlv_info.size;
} else {
snprintf(wlan_segment_name,

30
fs/fat/fat_write.c
View file

@ -806,21 +806,25 @@ static void fill_dentry(fsdata *mydata, dir_entry *dentptr,
static int check_overflow(fsdata *mydata, __u32 clustnum, loff_t size)
{
__u32 startsect, sect_num, offset;
__u32 total_clusters = 0;
if (clustnum > 0) {
startsect = mydata->data_begin +
clustnum * mydata->clust_size;
} else {
total_clusters = ((total_sector - mydata->rootdir_sect -
mydata->rootdir_size) /
mydata->clust_size) - 3;
/* the last sectors could be orphaned and not belong to any cluster */
if (clustnum >= total_clusters) {
return -1;
} else if (!clustnum) {
startsect = mydata->rootdir_sect;
sect_num = div_u64_rem(size, mydata->sect_size, &offset);
if (offset != 0)
sect_num++;
if (startsect + sect_num > total_sector)
return -1;
}
sect_num = div_u64_rem(size, mydata->sect_size, &offset);
if (offset != 0)
sect_num++;
if (startsect + sect_num > total_sector)
return -1;
return 0;
}
@ -1003,8 +1007,9 @@ static int do_fat_write(const char *filename, void *buffer, loff_t size,
if (mydata->fatsize == 32) {
mydata->data_begin = mydata->rootdir_sect -
(mydata->clust_size * 2);
mydata->rootdir_size = 0;
} else {
int rootdir_size;
__u16 rootdir_size;
rootdir_size = ((bs.dir_entries[1] * (int)256 +
bs.dir_entries[0]) *
@ -1013,6 +1018,7 @@ static int do_fat_write(const char *filename, void *buffer, loff_t size,
mydata->data_begin = mydata->rootdir_sect +
rootdir_size -
(mydata->clust_size * 2);
mydata->rootdir_size = rootdir_size;
}
mydata->fatbufnum = -1;

1
include/fat.h
View file

@ -174,6 +174,7 @@ typedef struct {
__u16 clust_size; /* Size of clusters in sectors */
int data_begin; /* The sector of the first cluster, can be negative */
int fatbufnum; /* Used by get_fatent, init to -1 */
__u16 rootdir_size; /* total sectors in rootdir */
} fsdata;
typedef int (file_detectfs_func)(void);