2018-05-06 21:58:06 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0+
|
2003-06-15 22:40:42 +00:00
|
|
|
/*
|
|
|
|
* fat.c
|
|
|
|
*
|
|
|
|
* R/O (V)FAT 12/16/32 filesystem implementation by Marcus Sundberg
|
|
|
|
*
|
|
|
|
* 2002-07-28 - rjones@nexus-tech.net - ported to ppcboot v1.1.6
|
|
|
|
* 2003-03-10 - kharris@nexus-tech.net - ported to uboot
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <common.h>
|
2016-02-29 22:25:52 +00:00
|
|
|
#include <blk.h>
|
2003-06-15 22:40:42 +00:00
|
|
|
#include <config.h>
|
2011-08-08 09:38:33 +00:00
|
|
|
#include <exports.h>
|
2003-06-15 22:40:42 +00:00
|
|
|
#include <fat.h>
|
2017-09-09 17:15:56 +00:00
|
|
|
#include <fs.h>
|
2020-05-10 17:40:05 +00:00
|
|
|
#include <log.h>
|
2003-06-15 22:40:42 +00:00
|
|
|
#include <asm/byteorder.h>
|
2003-09-10 22:30:53 +00:00
|
|
|
#include <part.h>
|
2012-04-11 04:08:53 +00:00
|
|
|
#include <malloc.h>
|
2015-09-02 23:24:58 +00:00
|
|
|
#include <memalign.h>
|
2020-05-10 17:39:56 +00:00
|
|
|
#include <asm/cache.h>
|
2012-04-11 04:08:53 +00:00
|
|
|
#include <linux/compiler.h>
|
2012-12-13 00:47:36 +00:00
|
|
|
#include <linux/ctype.h>
|
2003-06-15 22:40:42 +00:00
|
|
|
|
|
|
|
/*
|
2017-09-09 17:15:59 +00:00
|
|
|
* Convert a string to lowercase. Converts at most 'len' characters,
|
|
|
|
* 'len' may be larger than the length of 'str' if 'str' is NULL
|
|
|
|
* terminated.
|
2003-06-15 22:40:42 +00:00
|
|
|
*/
|
2017-09-09 17:15:59 +00:00
|
|
|
static void downcase(char *str, size_t len)
|
2003-06-15 22:40:42 +00:00
|
|
|
{
|
2017-09-09 17:15:59 +00:00
|
|
|
while (*str != '\0' && len--) {
|
2012-12-13 00:47:36 +00:00
|
|
|
*str = tolower(*str);
|
2003-06-15 22:40:42 +00:00
|
|
|
str++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-02-29 22:25:34 +00:00
|
|
|
static struct blk_desc *cur_dev;
|
2020-05-10 17:39:57 +00:00
|
|
|
static struct disk_partition cur_part_info;
|
2010-07-19 09:37:00 +00:00
|
|
|
|
2011-12-21 07:08:10 +00:00
|
|
|
#define DOS_BOOT_MAGIC_OFFSET 0x1fe
|
2003-09-10 22:30:53 +00:00
|
|
|
#define DOS_FS_TYPE_OFFSET 0x36
|
2010-07-19 09:36:57 +00:00
|
|
|
#define DOS_FS32_TYPE_OFFSET 0x52
|
2003-06-15 22:40:42 +00:00
|
|
|
|
2011-12-21 07:08:10 +00:00
|
|
|
static int disk_read(__u32 block, __u32 nr_blocks, void *buf)
|
2003-06-15 22:40:42 +00:00
|
|
|
{
|
2015-09-03 12:21:39 +00:00
|
|
|
ulong ret;
|
|
|
|
|
2016-02-29 22:25:52 +00:00
|
|
|
if (!cur_dev)
|
2003-09-10 22:30:53 +00:00
|
|
|
return -1;
|
2010-07-19 09:37:00 +00:00
|
|
|
|
2016-02-29 22:25:52 +00:00
|
|
|
ret = blk_dread(cur_dev, cur_part_info.start + block, nr_blocks, buf);
|
2015-09-03 12:21:39 +00:00
|
|
|
|
2017-08-15 01:02:08 +00:00
|
|
|
if (ret != nr_blocks)
|
2015-09-03 12:21:39 +00:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
return ret;
|
2003-06-15 22:40:42 +00:00
|
|
|
}
|
|
|
|
|
2020-05-10 17:39:57 +00:00
|
|
|
int fat_set_blk_dev(struct blk_desc *dev_desc, struct disk_partition *info)
|
2003-06-15 22:40:42 +00:00
|
|
|
{
|
2012-04-11 04:08:53 +00:00
|
|
|
ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz);
|
2003-09-10 22:30:53 +00:00
|
|
|
|
2012-10-17 06:44:59 +00:00
|
|
|
cur_dev = dev_desc;
|
|
|
|
cur_part_info = *info;
|
2011-12-21 07:08:10 +00:00
|
|
|
|
|
|
|
/* Make sure it has a valid FAT header */
|
|
|
|
if (disk_read(0, 1, buffer) != 1) {
|
|
|
|
cur_dev = NULL;
|
|
|
|
return -1;
|
2007-08-07 14:02:13 +00:00
|
|
|
}
|
2011-12-21 07:08:10 +00:00
|
|
|
|
|
|
|
/* Check if it's actually a DOS volume */
|
|
|
|
if (memcmp(buffer + DOS_BOOT_MAGIC_OFFSET, "\x55\xAA", 2)) {
|
|
|
|
cur_dev = NULL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check for FAT12/FAT16/FAT32 filesystem */
|
|
|
|
if (!memcmp(buffer + DOS_FS_TYPE_OFFSET, "FAT", 3))
|
|
|
|
return 0;
|
|
|
|
if (!memcmp(buffer + DOS_FS32_TYPE_OFFSET, "FAT32", 5))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
cur_dev = NULL;
|
|
|
|
return -1;
|
2003-06-15 22:40:42 +00:00
|
|
|
}
|
|
|
|
|
2016-02-29 22:25:34 +00:00
|
|
|
int fat_register_device(struct blk_desc *dev_desc, int part_no)
|
2012-10-17 06:44:59 +00:00
|
|
|
{
|
2020-05-10 17:39:57 +00:00
|
|
|
struct disk_partition info;
|
2012-10-17 06:44:59 +00:00
|
|
|
|
|
|
|
/* First close any currently found FAT filesystem */
|
|
|
|
cur_dev = NULL;
|
|
|
|
|
|
|
|
/* Read the partition table, if present */
|
2016-02-29 22:25:48 +00:00
|
|
|
if (part_get_info(dev_desc, part_no, &info)) {
|
2012-10-17 06:44:59 +00:00
|
|
|
if (part_no != 0) {
|
|
|
|
printf("** Partition %d not valid on device %d **\n",
|
2016-02-29 22:25:51 +00:00
|
|
|
part_no, dev_desc->devnum);
|
2012-10-17 06:44:59 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
info.start = 0;
|
|
|
|
info.size = dev_desc->lba;
|
|
|
|
info.blksz = dev_desc->blksz;
|
|
|
|
info.name[0] = 0;
|
|
|
|
info.type[0] = 0;
|
|
|
|
info.bootable = 0;
|
2017-01-27 10:00:42 +00:00
|
|
|
#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
|
2012-10-17 06:44:59 +00:00
|
|
|
info.uuid[0] = 0;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
return fat_set_blk_dev(dev_desc, &info);
|
|
|
|
}
|
2011-12-21 07:08:10 +00:00
|
|
|
|
2003-06-15 22:40:42 +00:00
|
|
|
/*
|
|
|
|
* Extract zero terminated short name from a directory entry.
|
|
|
|
*/
|
2012-07-20 13:18:44 +00:00
|
|
|
static void get_name(dir_entry *dirent, char *s_name)
|
2003-06-15 22:40:42 +00:00
|
|
|
{
|
|
|
|
char *ptr;
|
|
|
|
|
2021-01-20 23:23:33 +00:00
|
|
|
memcpy(s_name, dirent->nameext.name, 8);
|
2003-06-15 22:40:42 +00:00
|
|
|
s_name[8] = '\0';
|
|
|
|
ptr = s_name;
|
|
|
|
while (*ptr && *ptr != ' ')
|
|
|
|
ptr++;
|
2017-09-09 17:15:59 +00:00
|
|
|
if (dirent->lcase & CASE_LOWER_BASE)
|
|
|
|
downcase(s_name, (unsigned)(ptr - s_name));
|
2021-01-20 23:23:33 +00:00
|
|
|
if (dirent->nameext.ext[0] && dirent->nameext.ext[0] != ' ') {
|
2017-09-09 17:15:59 +00:00
|
|
|
*ptr++ = '.';
|
2021-01-20 23:23:33 +00:00
|
|
|
memcpy(ptr, dirent->nameext.ext, 3);
|
2017-09-09 17:15:59 +00:00
|
|
|
if (dirent->lcase & CASE_LOWER_EXT)
|
|
|
|
downcase(ptr, 3);
|
2003-06-15 22:40:42 +00:00
|
|
|
ptr[3] = '\0';
|
|
|
|
while (*ptr && *ptr != ' ')
|
|
|
|
ptr++;
|
|
|
|
}
|
|
|
|
*ptr = '\0';
|
|
|
|
if (*s_name == DELETED_FLAG)
|
|
|
|
*s_name = '\0';
|
|
|
|
else if (*s_name == aRING)
|
2008-11-27 21:30:27 +00:00
|
|
|
*s_name = DELETED_FLAG;
|
2003-06-15 22:40:42 +00:00
|
|
|
}
|
|
|
|
|
2016-12-16 23:27:51 +00:00
|
|
|
static int flush_dirty_fat_buffer(fsdata *mydata);
|
2019-01-23 06:20:04 +00:00
|
|
|
|
|
|
|
#if !CONFIG_IS_ENABLED(FAT_WRITE)
|
2016-12-16 23:27:51 +00:00
|
|
|
/* Stub for read only operation */
|
|
|
|
int flush_dirty_fat_buffer(fsdata *mydata)
|
|
|
|
{
|
|
|
|
(void)(mydata);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2003-06-15 22:40:42 +00:00
|
|
|
/*
|
|
|
|
* Get the entry at index 'entry' in a FAT (12/16/32) table.
|
|
|
|
* On failure 0x00 is returned.
|
|
|
|
*/
|
2012-07-20 13:18:44 +00:00
|
|
|
static __u32 get_fatent(fsdata *mydata, __u32 entry)
|
2003-06-15 22:40:42 +00:00
|
|
|
{
|
|
|
|
__u32 bufnum;
|
2017-01-26 20:22:36 +00:00
|
|
|
__u32 offset, off8;
|
2003-06-15 22:40:42 +00:00
|
|
|
__u32 ret = 0x00;
|
|
|
|
|
2016-12-16 23:27:51 +00:00
|
|
|
if (CHECK_CLUST(entry, mydata->fatsize)) {
|
|
|
|
printf("Error: Invalid FAT entry: 0x%08x\n", entry);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2003-06-15 22:40:42 +00:00
|
|
|
switch (mydata->fatsize) {
|
|
|
|
case 32:
|
|
|
|
bufnum = entry / FAT32BUFSIZE;
|
|
|
|
offset = entry - bufnum * FAT32BUFSIZE;
|
|
|
|
break;
|
|
|
|
case 16:
|
|
|
|
bufnum = entry / FAT16BUFSIZE;
|
|
|
|
offset = entry - bufnum * FAT16BUFSIZE;
|
|
|
|
break;
|
|
|
|
case 12:
|
|
|
|
bufnum = entry / FAT12BUFSIZE;
|
|
|
|
offset = entry - bufnum * FAT12BUFSIZE;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
/* Unsupported FAT size */
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-12-16 23:27:51 +00:00
|
|
|
debug("FAT%d: entry: 0x%08x = %d, offset: 0x%04x = %d\n",
|
2010-07-19 09:37:00 +00:00
|
|
|
mydata->fatsize, entry, entry, offset, offset);
|
2010-07-19 09:36:58 +00:00
|
|
|
|
2003-06-15 22:40:42 +00:00
|
|
|
/* Read a new block of FAT entries into the cache. */
|
|
|
|
if (bufnum != mydata->fatbufnum) {
|
2011-08-08 09:39:29 +00:00
|
|
|
__u32 getsize = FATBUFBLOCKS;
|
2003-06-15 22:40:42 +00:00
|
|
|
__u8 *bufptr = mydata->fatbuf;
|
|
|
|
__u32 fatlength = mydata->fatlength;
|
|
|
|
__u32 startblock = bufnum * FATBUFBLOCKS;
|
|
|
|
|
2016-12-16 23:27:50 +00:00
|
|
|
/* Cap length if fatlength is not a multiple of FATBUFBLOCKS */
|
2012-07-20 13:19:29 +00:00
|
|
|
if (startblock + getsize > fatlength)
|
|
|
|
getsize = fatlength - startblock;
|
2011-08-08 09:39:29 +00:00
|
|
|
|
2003-06-15 22:40:42 +00:00
|
|
|
startblock += mydata->fat_sect; /* Offset from start of disk */
|
|
|
|
|
2016-12-16 23:27:51 +00:00
|
|
|
/* Write back the fatbuf to the disk */
|
|
|
|
if (flush_dirty_fat_buffer(mydata) < 0)
|
|
|
|
return -1;
|
|
|
|
|
2003-06-15 22:40:42 +00:00
|
|
|
if (disk_read(startblock, getsize, bufptr) < 0) {
|
2010-07-19 09:37:00 +00:00
|
|
|
debug("Error reading FAT blocks\n");
|
2003-06-15 22:40:42 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
mydata->fatbufnum = bufnum;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get the actual entry from the table */
|
|
|
|
switch (mydata->fatsize) {
|
|
|
|
case 32:
|
2010-07-19 09:37:00 +00:00
|
|
|
ret = FAT2CPU32(((__u32 *) mydata->fatbuf)[offset]);
|
2003-06-15 22:40:42 +00:00
|
|
|
break;
|
|
|
|
case 16:
|
2010-07-19 09:37:00 +00:00
|
|
|
ret = FAT2CPU16(((__u16 *) mydata->fatbuf)[offset]);
|
2003-06-15 22:40:42 +00:00
|
|
|
break;
|
2010-07-19 09:37:00 +00:00
|
|
|
case 12:
|
2017-01-26 20:22:36 +00:00
|
|
|
off8 = (offset * 3) / 2;
|
|
|
|
/* fatbut + off8 may be unaligned, read in byte granularity */
|
|
|
|
ret = mydata->fatbuf[off8] + (mydata->fatbuf[off8 + 1] << 8);
|
2016-12-17 02:55:10 +00:00
|
|
|
|
|
|
|
if (offset & 0x1)
|
|
|
|
ret >>= 4;
|
|
|
|
ret &= 0xfff;
|
2003-06-15 22:40:42 +00:00
|
|
|
}
|
2016-12-16 23:27:51 +00:00
|
|
|
debug("FAT%d: ret: 0x%08x, entry: 0x%08x, offset: 0x%04x\n",
|
|
|
|
mydata->fatsize, ret, entry, offset);
|
2003-06-15 22:40:42 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Read at most 'size' bytes from the specified cluster into 'buffer'.
|
|
|
|
* Return 0 on success, -1 otherwise.
|
|
|
|
*/
|
|
|
|
static int
|
2012-07-20 13:18:44 +00:00
|
|
|
get_cluster(fsdata *mydata, __u32 clustnum, __u8 *buffer, unsigned long size)
|
2003-06-15 22:40:42 +00:00
|
|
|
{
|
|
|
|
__u32 startsect;
|
2011-12-20 07:41:13 +00:00
|
|
|
int ret;
|
2003-06-15 22:40:42 +00:00
|
|
|
|
|
|
|
if (clustnum > 0) {
|
2017-09-09 17:16:00 +00:00
|
|
|
startsect = clust_to_sect(mydata, clustnum);
|
2003-06-15 22:40:42 +00:00
|
|
|
} else {
|
|
|
|
startsect = mydata->rootdir_sect;
|
|
|
|
}
|
|
|
|
|
2010-07-19 09:37:00 +00:00
|
|
|
debug("gc - clustnum: %d, startsect: %d\n", clustnum, startsect);
|
|
|
|
|
2012-07-20 13:21:08 +00:00
|
|
|
if ((unsigned long)buffer & (ARCH_DMA_MINALIGN - 1)) {
|
2012-04-11 04:08:53 +00:00
|
|
|
ALLOC_CACHE_ALIGN_BUFFER(__u8, tmpbuf, mydata->sect_size);
|
2010-07-19 09:37:00 +00:00
|
|
|
|
2018-09-13 17:42:47 +00:00
|
|
|
debug("FAT: Misaligned buffer address (%p)\n", buffer);
|
2012-07-20 13:21:08 +00:00
|
|
|
|
|
|
|
while (size >= mydata->sect_size) {
|
|
|
|
ret = disk_read(startsect++, 1, tmpbuf);
|
|
|
|
if (ret != 1) {
|
|
|
|
debug("Error reading data (got %d)\n", ret);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(buffer, tmpbuf, mydata->sect_size);
|
|
|
|
buffer += mydata->sect_size;
|
|
|
|
size -= mydata->sect_size;
|
|
|
|
}
|
2021-09-26 18:36:04 +00:00
|
|
|
} else if (size >= mydata->sect_size) {
|
|
|
|
__u32 bytes_read;
|
|
|
|
__u32 sect_count = size / mydata->sect_size;
|
|
|
|
|
|
|
|
ret = disk_read(startsect, sect_count, buffer);
|
|
|
|
if (ret != sect_count) {
|
2012-07-20 13:21:08 +00:00
|
|
|
debug("Error reading data (got %d)\n", ret);
|
|
|
|
return -1;
|
|
|
|
}
|
2021-09-26 18:36:04 +00:00
|
|
|
bytes_read = sect_count * mydata->sect_size;
|
|
|
|
startsect += sect_count;
|
|
|
|
buffer += bytes_read;
|
|
|
|
size -= bytes_read;
|
2012-07-20 13:21:08 +00:00
|
|
|
}
|
|
|
|
if (size) {
|
|
|
|
ALLOC_CACHE_ALIGN_BUFFER(__u8, tmpbuf, mydata->sect_size);
|
|
|
|
|
|
|
|
ret = disk_read(startsect, 1, tmpbuf);
|
2011-12-20 07:41:13 +00:00
|
|
|
if (ret != 1) {
|
|
|
|
debug("Error reading data (got %d)\n", ret);
|
2003-09-10 22:30:53 +00:00
|
|
|
return -1;
|
2003-06-15 22:40:42 +00:00
|
|
|
}
|
2003-09-10 22:30:53 +00:00
|
|
|
|
2012-07-20 13:21:08 +00:00
|
|
|
memcpy(buffer, tmpbuf, size);
|
2003-06-15 22:40:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2019-09-12 17:19:29 +00:00
|
|
|
/**
|
|
|
|
* get_contents() - read from file
|
|
|
|
*
|
2012-09-18 08:14:56 +00:00
|
|
|
* Read at most 'maxsize' bytes from 'pos' in the file associated with 'dentptr'
|
2019-09-12 17:19:29 +00:00
|
|
|
* into 'buffer'. Update the number of bytes read in *gotsize or return -1 on
|
|
|
|
* fatal errors.
|
|
|
|
*
|
|
|
|
* @mydata: file system description
|
|
|
|
* @dentprt: directory entry pointer
|
|
|
|
* @pos: position from where to read
|
|
|
|
* @buffer: buffer into which to read
|
|
|
|
* @maxsize: maximum number of bytes to read
|
|
|
|
* @gotsize: number of bytes actually read
|
|
|
|
* Return: -1 on error, otherwise 0
|
2003-06-15 22:40:42 +00:00
|
|
|
*/
|
2014-11-17 22:39:35 +00:00
|
|
|
static int get_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos,
|
|
|
|
__u8 *buffer, loff_t maxsize, loff_t *gotsize)
|
2003-06-15 22:40:42 +00:00
|
|
|
{
|
2014-11-17 22:39:35 +00:00
|
|
|
loff_t filesize = FAT2CPU32(dentptr->size);
|
2011-08-08 09:38:33 +00:00
|
|
|
unsigned int bytesperclust = mydata->clust_size * mydata->sect_size;
|
2003-06-15 22:40:42 +00:00
|
|
|
__u32 curclust = START(dentptr);
|
2003-09-10 22:30:53 +00:00
|
|
|
__u32 endclust, newclust;
|
2014-11-17 22:39:35 +00:00
|
|
|
loff_t actsize;
|
2003-06-15 22:40:42 +00:00
|
|
|
|
2014-11-17 22:39:35 +00:00
|
|
|
*gotsize = 0;
|
|
|
|
debug("Filesize: %llu bytes\n", filesize);
|
2003-06-15 22:40:42 +00:00
|
|
|
|
2012-09-18 08:14:56 +00:00
|
|
|
if (pos >= filesize) {
|
2014-11-17 22:39:35 +00:00
|
|
|
debug("Read position past EOF: %llu\n", pos);
|
|
|
|
return 0;
|
2012-09-18 08:14:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (maxsize > 0 && filesize > pos + maxsize)
|
|
|
|
filesize = pos + maxsize;
|
2003-06-15 22:40:42 +00:00
|
|
|
|
2014-11-17 22:39:35 +00:00
|
|
|
debug("%llu bytes\n", filesize);
|
2010-07-19 09:37:00 +00:00
|
|
|
|
2012-09-18 08:14:56 +00:00
|
|
|
actsize = bytesperclust;
|
|
|
|
|
|
|
|
/* go to cluster at pos */
|
|
|
|
while (actsize <= pos) {
|
|
|
|
curclust = get_fatent(mydata, curclust);
|
|
|
|
if (CHECK_CLUST(curclust, mydata->fatsize)) {
|
|
|
|
debug("curclust: 0x%x\n", curclust);
|
2019-09-12 17:19:29 +00:00
|
|
|
printf("Invalid FAT entry\n");
|
|
|
|
return -1;
|
2012-09-18 08:14:56 +00:00
|
|
|
}
|
|
|
|
actsize += bytesperclust;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* actsize > pos */
|
|
|
|
actsize -= bytesperclust;
|
|
|
|
filesize -= actsize;
|
|
|
|
pos -= actsize;
|
|
|
|
|
|
|
|
/* align to beginning of next cluster if any */
|
|
|
|
if (pos) {
|
2019-02-11 06:56:19 +00:00
|
|
|
__u8 *tmp_buffer;
|
|
|
|
|
2014-11-17 22:39:35 +00:00
|
|
|
actsize = min(filesize, (loff_t)bytesperclust);
|
2019-02-11 06:56:19 +00:00
|
|
|
tmp_buffer = malloc_cache_aligned(actsize);
|
|
|
|
if (!tmp_buffer) {
|
|
|
|
debug("Error: allocating buffer\n");
|
2019-09-12 17:19:30 +00:00
|
|
|
return -1;
|
2019-02-11 06:56:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (get_cluster(mydata, curclust, tmp_buffer, actsize) != 0) {
|
2012-09-18 08:14:56 +00:00
|
|
|
printf("Error reading cluster\n");
|
2019-02-11 06:56:19 +00:00
|
|
|
free(tmp_buffer);
|
2012-09-18 08:14:56 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
filesize -= actsize;
|
|
|
|
actsize -= pos;
|
2019-02-11 06:56:19 +00:00
|
|
|
memcpy(buffer, tmp_buffer + pos, actsize);
|
|
|
|
free(tmp_buffer);
|
2014-11-17 22:39:35 +00:00
|
|
|
*gotsize += actsize;
|
2012-09-18 08:14:56 +00:00
|
|
|
if (!filesize)
|
2014-11-17 22:39:35 +00:00
|
|
|
return 0;
|
2012-09-18 08:14:56 +00:00
|
|
|
buffer += actsize;
|
|
|
|
|
|
|
|
curclust = get_fatent(mydata, curclust);
|
|
|
|
if (CHECK_CLUST(curclust, mydata->fatsize)) {
|
|
|
|
debug("curclust: 0x%x\n", curclust);
|
2019-09-12 17:19:29 +00:00
|
|
|
printf("Invalid FAT entry\n");
|
|
|
|
return -1;
|
2012-09-18 08:14:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-07-19 09:37:00 +00:00
|
|
|
actsize = bytesperclust;
|
|
|
|
endclust = curclust;
|
2003-06-15 22:40:42 +00:00
|
|
|
|
|
|
|
do {
|
2003-09-10 22:30:53 +00:00
|
|
|
/* search for consecutive clusters */
|
2010-07-19 09:37:00 +00:00
|
|
|
while (actsize < filesize) {
|
2003-09-10 22:30:53 +00:00
|
|
|
newclust = get_fatent(mydata, endclust);
|
2010-07-19 09:37:00 +00:00
|
|
|
if ((newclust - 1) != endclust)
|
2003-09-10 22:30:53 +00:00
|
|
|
goto getit;
|
2008-03-02 22:33:46 +00:00
|
|
|
if (CHECK_CLUST(newclust, mydata->fatsize)) {
|
2010-07-19 09:37:00 +00:00
|
|
|
debug("curclust: 0x%x\n", newclust);
|
2019-09-12 17:19:29 +00:00
|
|
|
printf("Invalid FAT entry\n");
|
|
|
|
return -1;
|
2003-09-10 22:30:53 +00:00
|
|
|
}
|
2010-07-19 09:37:00 +00:00
|
|
|
endclust = newclust;
|
|
|
|
actsize += bytesperclust;
|
2003-09-10 22:30:53 +00:00
|
|
|
}
|
2010-07-19 09:37:00 +00:00
|
|
|
|
2003-09-10 22:30:53 +00:00
|
|
|
/* get remaining bytes */
|
2010-07-19 09:37:00 +00:00
|
|
|
actsize = filesize;
|
2012-07-20 13:21:37 +00:00
|
|
|
if (get_cluster(mydata, curclust, buffer, (int)actsize) != 0) {
|
2010-07-19 09:37:00 +00:00
|
|
|
printf("Error reading cluster\n");
|
2003-09-10 22:30:53 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2014-11-17 22:39:35 +00:00
|
|
|
*gotsize += actsize;
|
|
|
|
return 0;
|
2003-09-10 22:30:53 +00:00
|
|
|
getit:
|
|
|
|
if (get_cluster(mydata, curclust, buffer, (int)actsize) != 0) {
|
2010-07-19 09:37:00 +00:00
|
|
|
printf("Error reading cluster\n");
|
2003-09-10 22:30:53 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2014-11-17 22:39:35 +00:00
|
|
|
*gotsize += (int)actsize;
|
2003-09-10 22:30:53 +00:00
|
|
|
filesize -= actsize;
|
|
|
|
buffer += actsize;
|
2010-07-19 09:37:00 +00:00
|
|
|
|
2003-09-10 22:30:53 +00:00
|
|
|
curclust = get_fatent(mydata, endclust);
|
2008-03-02 22:33:46 +00:00
|
|
|
if (CHECK_CLUST(curclust, mydata->fatsize)) {
|
2010-07-19 09:37:00 +00:00
|
|
|
debug("curclust: 0x%x\n", curclust);
|
|
|
|
printf("Invalid FAT entry\n");
|
2019-09-12 17:19:29 +00:00
|
|
|
return -1;
|
2003-06-15 22:40:42 +00:00
|
|
|
}
|
2010-07-19 09:37:00 +00:00
|
|
|
actsize = bytesperclust;
|
|
|
|
endclust = curclust;
|
2003-06-15 22:40:42 +00:00
|
|
|
} while (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Extract the file name information from 'slotptr' into 'l_name',
|
|
|
|
* starting at l_name[*idx].
|
|
|
|
* Return 1 if terminator (zero byte) is found, 0 otherwise.
|
|
|
|
*/
|
2012-07-20 13:18:44 +00:00
|
|
|
static int slot2str(dir_slot *slotptr, char *l_name, int *idx)
|
2003-06-15 22:40:42 +00:00
|
|
|
{
|
|
|
|
int j;
|
|
|
|
|
|
|
|
for (j = 0; j <= 8; j += 2) {
|
|
|
|
l_name[*idx] = slotptr->name0_4[j];
|
2010-07-19 09:37:00 +00:00
|
|
|
if (l_name[*idx] == 0x00)
|
|
|
|
return 1;
|
2003-06-15 22:40:42 +00:00
|
|
|
(*idx)++;
|
|
|
|
}
|
|
|
|
for (j = 0; j <= 10; j += 2) {
|
|
|
|
l_name[*idx] = slotptr->name5_10[j];
|
2010-07-19 09:37:00 +00:00
|
|
|
if (l_name[*idx] == 0x00)
|
|
|
|
return 1;
|
2003-06-15 22:40:42 +00:00
|
|
|
(*idx)++;
|
|
|
|
}
|
|
|
|
for (j = 0; j <= 2; j += 2) {
|
|
|
|
l_name[*idx] = slotptr->name11_12[j];
|
2010-07-19 09:37:00 +00:00
|
|
|
if (l_name[*idx] == 0x00)
|
|
|
|
return 1;
|
2003-06-15 22:40:42 +00:00
|
|
|
(*idx)++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Calculate short name checksum */
|
2021-01-20 23:23:33 +00:00
|
|
|
static __u8 mkcksum(struct nameext *nameext)
|
2003-06-15 22:40:42 +00:00
|
|
|
{
|
|
|
|
int i;
|
2021-01-20 23:23:33 +00:00
|
|
|
u8 *pos = (void *)nameext;
|
2010-07-19 09:37:00 +00:00
|
|
|
|
2003-06-15 22:40:42 +00:00
|
|
|
__u8 ret = 0;
|
|
|
|
|
2021-01-20 23:23:33 +00:00
|
|
|
for (i = 0; i < 11; i++)
|
|
|
|
ret = (((ret & 1) << 7) | ((ret & 0xfe) >> 1)) + pos[i];
|
2003-06-15 22:40:42 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Read boot sector and volume info from a FAT filesystem
|
|
|
|
*/
|
|
|
|
static int
|
2012-07-20 13:18:44 +00:00
|
|
|
read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize)
|
2003-06-15 22:40:42 +00:00
|
|
|
{
|
2011-08-08 09:38:33 +00:00
|
|
|
__u8 *block;
|
2003-06-15 22:40:42 +00:00
|
|
|
volume_info *vistart;
|
2011-08-08 09:38:33 +00:00
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (cur_dev == NULL) {
|
|
|
|
debug("Error: no device selected\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2017-09-30 23:25:21 +00:00
|
|
|
block = malloc_cache_aligned(cur_dev->blksz);
|
2011-08-08 09:38:33 +00:00
|
|
|
if (block == NULL) {
|
|
|
|
debug("Error: allocating block\n");
|
|
|
|
return -1;
|
|
|
|
}
|
2003-06-15 22:40:42 +00:00
|
|
|
|
2012-07-20 13:18:44 +00:00
|
|
|
if (disk_read(0, 1, block) < 0) {
|
2010-07-19 09:37:00 +00:00
|
|
|
debug("Error: reading block\n");
|
2011-08-08 09:38:33 +00:00
|
|
|
goto fail;
|
2003-06-15 22:40:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(bs, block, sizeof(boot_sector));
|
2010-07-19 09:37:00 +00:00
|
|
|
bs->reserved = FAT2CPU16(bs->reserved);
|
|
|
|
bs->fat_length = FAT2CPU16(bs->fat_length);
|
|
|
|
bs->secs_track = FAT2CPU16(bs->secs_track);
|
|
|
|
bs->heads = FAT2CPU16(bs->heads);
|
|
|
|
bs->total_sect = FAT2CPU32(bs->total_sect);
|
2003-06-15 22:40:42 +00:00
|
|
|
|
|
|
|
/* FAT32 entries */
|
|
|
|
if (bs->fat_length == 0) {
|
|
|
|
/* Assume FAT32 */
|
|
|
|
bs->fat32_length = FAT2CPU32(bs->fat32_length);
|
2010-07-19 09:37:00 +00:00
|
|
|
bs->flags = FAT2CPU16(bs->flags);
|
2003-06-15 22:40:42 +00:00
|
|
|
bs->root_cluster = FAT2CPU32(bs->root_cluster);
|
2010-07-19 09:37:00 +00:00
|
|
|
bs->info_sector = FAT2CPU16(bs->info_sector);
|
|
|
|
bs->backup_boot = FAT2CPU16(bs->backup_boot);
|
|
|
|
vistart = (volume_info *)(block + sizeof(boot_sector));
|
2003-06-15 22:40:42 +00:00
|
|
|
*fatsize = 32;
|
|
|
|
} else {
|
2010-07-19 09:37:00 +00:00
|
|
|
vistart = (volume_info *)&(bs->fat32_length);
|
2003-06-15 22:40:42 +00:00
|
|
|
*fatsize = 0;
|
|
|
|
}
|
|
|
|
memcpy(volinfo, vistart, sizeof(volume_info));
|
|
|
|
|
|
|
|
if (*fatsize == 32) {
|
2010-07-19 09:37:00 +00:00
|
|
|
if (strncmp(FAT32_SIGN, vistart->fs_type, SIGNLEN) == 0)
|
2011-08-08 09:38:33 +00:00
|
|
|
goto exit;
|
2003-06-15 22:40:42 +00:00
|
|
|
} else {
|
2009-05-20 12:55:41 +00:00
|
|
|
if (strncmp(FAT12_SIGN, vistart->fs_type, SIGNLEN) == 0) {
|
2003-06-15 22:40:42 +00:00
|
|
|
*fatsize = 12;
|
2011-08-08 09:38:33 +00:00
|
|
|
goto exit;
|
2003-06-15 22:40:42 +00:00
|
|
|
}
|
2009-05-20 12:55:41 +00:00
|
|
|
if (strncmp(FAT16_SIGN, vistart->fs_type, SIGNLEN) == 0) {
|
2003-06-15 22:40:42 +00:00
|
|
|
*fatsize = 16;
|
2011-08-08 09:38:33 +00:00
|
|
|
goto exit;
|
2003-06-15 22:40:42 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-07-19 09:37:00 +00:00
|
|
|
debug("Error: broken fs_type sign\n");
|
2011-08-08 09:38:33 +00:00
|
|
|
fail:
|
|
|
|
ret = -1;
|
|
|
|
exit:
|
|
|
|
free(block);
|
|
|
|
return ret;
|
2003-06-15 22:40:42 +00:00
|
|
|
}
|
|
|
|
|
2017-09-09 17:15:52 +00:00
|
|
|
static int get_fs_info(fsdata *mydata)
|
2003-06-15 22:40:42 +00:00
|
|
|
{
|
2010-07-19 09:37:00 +00:00
|
|
|
boot_sector bs;
|
|
|
|
volume_info volinfo;
|
2017-09-09 17:15:52 +00:00
|
|
|
int ret;
|
2010-07-19 09:37:00 +00:00
|
|
|
|
2017-09-09 17:15:52 +00:00
|
|
|
ret = read_bootsectandvi(&bs, &volinfo, &mydata->fatsize);
|
|
|
|
if (ret) {
|
2010-07-19 09:37:00 +00:00
|
|
|
debug("Error: reading boot sector\n");
|
2017-09-09 17:15:52 +00:00
|
|
|
return ret;
|
2010-07-19 09:37:00 +00:00
|
|
|
}
|
|
|
|
|
2011-08-19 09:32:34 +00:00
|
|
|
if (mydata->fatsize == 32) {
|
2010-07-19 09:37:00 +00:00
|
|
|
mydata->fatlength = bs.fat32_length;
|
2018-09-11 06:58:58 +00:00
|
|
|
mydata->total_sect = bs.total_sect;
|
2011-08-19 09:32:34 +00:00
|
|
|
} else {
|
2010-07-19 09:37:00 +00:00
|
|
|
mydata->fatlength = bs.fat_length;
|
2018-09-11 06:58:58 +00:00
|
|
|
mydata->total_sect = (bs.sectors[1] << 8) + bs.sectors[0];
|
|
|
|
if (!mydata->total_sect)
|
|
|
|
mydata->total_sect = bs.total_sect;
|
2011-08-19 09:32:34 +00:00
|
|
|
}
|
2018-09-11 06:58:58 +00:00
|
|
|
if (!mydata->total_sect) /* unlikely */
|
|
|
|
mydata->total_sect = (u32)cur_part_info.size;
|
2010-07-19 09:37:00 +00:00
|
|
|
|
2018-09-11 06:58:58 +00:00
|
|
|
mydata->fats = bs.fats;
|
2010-07-19 09:37:00 +00:00
|
|
|
mydata->fat_sect = bs.reserved;
|
|
|
|
|
2017-09-09 17:15:52 +00:00
|
|
|
mydata->rootdir_sect = mydata->fat_sect + mydata->fatlength * bs.fats;
|
2010-07-19 09:37:00 +00:00
|
|
|
|
2011-08-08 09:38:33 +00:00
|
|
|
mydata->sect_size = (bs.sector_size[1] << 8) + bs.sector_size[0];
|
2010-07-19 09:37:00 +00:00
|
|
|
mydata->clust_size = bs.cluster_size;
|
2011-12-20 07:41:13 +00:00
|
|
|
if (mydata->sect_size != cur_part_info.blksz) {
|
|
|
|
printf("Error: FAT sector size mismatch (fs=%hu, dev=%lu)\n",
|
|
|
|
mydata->sect_size, cur_part_info.blksz);
|
|
|
|
return -1;
|
|
|
|
}
|
2018-11-26 14:56:57 +00:00
|
|
|
if (mydata->clust_size == 0) {
|
|
|
|
printf("Error: FAT cluster size not set\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if ((unsigned int)mydata->clust_size * mydata->sect_size >
|
|
|
|
MAX_CLUSTSIZE) {
|
|
|
|
printf("Error: FAT cluster size too big (cs=%u, max=%u)\n",
|
|
|
|
(unsigned int)mydata->clust_size * mydata->sect_size,
|
|
|
|
MAX_CLUSTSIZE);
|
|
|
|
return -1;
|
|
|
|
}
|
2010-07-19 09:37:00 +00:00
|
|
|
|
|
|
|
if (mydata->fatsize == 32) {
|
|
|
|
mydata->data_begin = mydata->rootdir_sect -
|
|
|
|
(mydata->clust_size * 2);
|
2017-09-09 17:15:53 +00:00
|
|
|
mydata->root_cluster = bs.root_cluster;
|
2010-07-19 09:37:00 +00:00
|
|
|
} else {
|
2017-09-09 17:15:52 +00:00
|
|
|
mydata->rootdir_size = ((bs.dir_entries[1] * (int)256 +
|
|
|
|
bs.dir_entries[0]) *
|
|
|
|
sizeof(dir_entry)) /
|
|
|
|
mydata->sect_size;
|
2010-07-19 09:37:00 +00:00
|
|
|
mydata->data_begin = mydata->rootdir_sect +
|
2017-09-09 17:15:52 +00:00
|
|
|
mydata->rootdir_size -
|
2010-07-19 09:37:00 +00:00
|
|
|
(mydata->clust_size * 2);
|
2019-02-27 10:55:57 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The root directory is not cluster-aligned and may be on a
|
|
|
|
* "negative" cluster, this will be handled specially in
|
2020-11-22 08:19:52 +00:00
|
|
|
* fat_next_cluster().
|
2019-02-27 10:55:57 +00:00
|
|
|
*/
|
|
|
|
mydata->root_cluster = 0;
|
2010-07-19 09:37:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
mydata->fatbufnum = -1;
|
2016-09-11 20:51:40 +00:00
|
|
|
mydata->fat_dirty = 0;
|
2017-09-30 23:25:21 +00:00
|
|
|
mydata->fatbuf = malloc_cache_aligned(FATBUFSIZE);
|
2011-08-08 09:38:33 +00:00
|
|
|
if (mydata->fatbuf == NULL) {
|
|
|
|
debug("Error: allocating memory\n");
|
|
|
|
return -1;
|
|
|
|
}
|
2003-06-15 22:40:42 +00:00
|
|
|
|
2010-07-19 09:37:00 +00:00
|
|
|
debug("FAT%d, fat_sect: %d, fatlength: %d\n",
|
|
|
|
mydata->fatsize, mydata->fat_sect, mydata->fatlength);
|
|
|
|
debug("Rootdir begins at cluster: %d, sector: %d, offset: %x\n"
|
|
|
|
"Data begins at: %d\n",
|
2017-09-09 17:15:53 +00:00
|
|
|
mydata->root_cluster,
|
2010-07-19 09:37:00 +00:00
|
|
|
mydata->rootdir_sect,
|
2011-08-08 09:38:33 +00:00
|
|
|
mydata->rootdir_sect * mydata->sect_size, mydata->data_begin);
|
|
|
|
debug("Sector size: %d, cluster size: %d\n", mydata->sect_size,
|
|
|
|
mydata->clust_size);
|
2010-07-19 09:37:00 +00:00
|
|
|
|
2017-09-09 17:15:52 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2020-11-22 08:19:52 +00:00
|
|
|
/**
|
|
|
|
* struct fat_itr - directory iterator, to simplify filesystem traversal
|
2017-09-09 17:15:53 +00:00
|
|
|
*
|
|
|
|
* Implements an iterator pattern to traverse directory tables,
|
|
|
|
* transparently handling directory tables split across multiple
|
|
|
|
* clusters, and the difference between FAT12/FAT16 root directory
|
|
|
|
* (contiguous) and subdirectories + FAT32 root (chained).
|
|
|
|
*
|
2020-11-22 08:19:52 +00:00
|
|
|
* Rough usage
|
2017-09-09 17:15:53 +00:00
|
|
|
*
|
2020-11-22 08:19:52 +00:00
|
|
|
* .. code-block:: c
|
2017-09-09 17:15:53 +00:00
|
|
|
*
|
2020-11-22 08:19:52 +00:00
|
|
|
* for (fat_itr_root(&itr, fsdata); fat_itr_next(&itr); ) {
|
|
|
|
* // to traverse down to a subdirectory pointed to by
|
|
|
|
* // current iterator position:
|
|
|
|
* fat_itr_child(&itr, &itr);
|
|
|
|
* }
|
|
|
|
*
|
|
|
|
* For a more complete example, see fat_itr_resolve().
|
2017-09-09 17:15:53 +00:00
|
|
|
*/
|
2020-11-22 08:19:52 +00:00
|
|
|
struct fat_itr {
|
|
|
|
/**
|
|
|
|
* @fsdata: filesystem parameters
|
|
|
|
*/
|
|
|
|
fsdata *fsdata;
|
|
|
|
/**
|
|
|
|
* @start_clust: first cluster
|
|
|
|
*/
|
|
|
|
unsigned int start_clust;
|
|
|
|
/**
|
|
|
|
* @clust: current cluster
|
|
|
|
*/
|
|
|
|
unsigned int clust;
|
|
|
|
/**
|
|
|
|
* @next_clust: next cluster if remaining == 0
|
|
|
|
*/
|
|
|
|
unsigned int next_clust;
|
|
|
|
/**
|
|
|
|
* @last_cluster: set if last cluster of directory reached
|
|
|
|
*/
|
|
|
|
int last_cluster;
|
|
|
|
/**
|
|
|
|
* @is_root: is iterator at root directory
|
|
|
|
*/
|
|
|
|
int is_root;
|
|
|
|
/**
|
|
|
|
* @remaining: remaining directory entries in current cluster
|
|
|
|
*/
|
|
|
|
int remaining;
|
|
|
|
/**
|
|
|
|
* @dent: current directory entry
|
|
|
|
*/
|
|
|
|
dir_entry *dent;
|
2020-11-19 06:44:08 +00:00
|
|
|
/**
|
|
|
|
* @dent_rem: remaining entries after long name start
|
|
|
|
*/
|
|
|
|
int dent_rem;
|
|
|
|
/**
|
|
|
|
* @dent_clust: cluster of long name start
|
|
|
|
*/
|
|
|
|
unsigned int dent_clust;
|
|
|
|
/**
|
|
|
|
* @dent_start: first directory entry for long name
|
|
|
|
*/
|
|
|
|
dir_entry *dent_start;
|
2020-11-22 08:19:52 +00:00
|
|
|
/**
|
|
|
|
* @l_name: long name of current directory entry
|
|
|
|
*/
|
|
|
|
char l_name[VFAT_MAXLEN_BYTES];
|
|
|
|
/**
|
|
|
|
* @s_name: short 8.3 name of current directory entry
|
|
|
|
*/
|
|
|
|
char s_name[14];
|
|
|
|
/**
|
|
|
|
* @name: l_name if there is one, else s_name
|
|
|
|
*/
|
|
|
|
char *name;
|
|
|
|
/**
|
|
|
|
* @block: buffer for current cluster
|
|
|
|
*/
|
|
|
|
u8 block[MAX_CLUSTSIZE] __aligned(ARCH_DMA_MINALIGN);
|
|
|
|
};
|
2017-09-09 17:15:53 +00:00
|
|
|
|
|
|
|
static int fat_itr_isdir(fat_itr *itr);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* fat_itr_root() - initialize an iterator to start at the root
|
|
|
|
* directory
|
|
|
|
*
|
|
|
|
* @itr: iterator to initialize
|
|
|
|
* @fsdata: filesystem data for the partition
|
2022-01-19 17:05:50 +00:00
|
|
|
* Return: 0 on success, else -errno
|
2017-09-09 17:15:53 +00:00
|
|
|
*/
|
|
|
|
static int fat_itr_root(fat_itr *itr, fsdata *fsdata)
|
|
|
|
{
|
|
|
|
if (get_fs_info(fsdata))
|
|
|
|
return -ENXIO;
|
|
|
|
|
|
|
|
itr->fsdata = fsdata;
|
2020-11-22 15:04:47 +00:00
|
|
|
itr->start_clust = fsdata->root_cluster;
|
2017-09-09 17:15:53 +00:00
|
|
|
itr->clust = fsdata->root_cluster;
|
2018-09-11 06:59:00 +00:00
|
|
|
itr->next_clust = fsdata->root_cluster;
|
2017-09-09 17:15:53 +00:00
|
|
|
itr->dent = NULL;
|
|
|
|
itr->remaining = 0;
|
|
|
|
itr->last_cluster = 0;
|
|
|
|
itr->is_root = 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* fat_itr_child() - initialize an iterator to descend into a sub-
|
|
|
|
* directory
|
|
|
|
*
|
|
|
|
* Initializes 'itr' to iterate the contents of the directory at
|
|
|
|
* the current cursor position of 'parent'. It is an error to
|
|
|
|
* call this if the current cursor of 'parent' is pointing at a
|
|
|
|
* regular file.
|
|
|
|
*
|
|
|
|
* Note that 'itr' and 'parent' can be the same pointer if you do
|
|
|
|
* not need to preserve 'parent' after this call, which is useful
|
|
|
|
* for traversing directory structure to resolve a file/directory.
|
|
|
|
*
|
|
|
|
* @itr: iterator to initialize
|
|
|
|
* @parent: the iterator pointing at a directory entry in the
|
|
|
|
* parent directory of the directory to iterate
|
|
|
|
*/
|
|
|
|
static void fat_itr_child(fat_itr *itr, fat_itr *parent)
|
|
|
|
{
|
|
|
|
fsdata *mydata = parent->fsdata; /* for silly macros */
|
|
|
|
unsigned clustnum = START(parent->dent);
|
|
|
|
|
|
|
|
assert(fat_itr_isdir(parent));
|
|
|
|
|
|
|
|
itr->fsdata = parent->fsdata;
|
2018-09-11 06:59:09 +00:00
|
|
|
itr->start_clust = clustnum;
|
2017-09-09 17:15:53 +00:00
|
|
|
if (clustnum > 0) {
|
|
|
|
itr->clust = clustnum;
|
2018-09-11 06:59:00 +00:00
|
|
|
itr->next_clust = clustnum;
|
2017-09-25 19:06:33 +00:00
|
|
|
itr->is_root = 0;
|
2017-09-09 17:15:53 +00:00
|
|
|
} else {
|
|
|
|
itr->clust = parent->fsdata->root_cluster;
|
2018-09-11 06:59:00 +00:00
|
|
|
itr->next_clust = parent->fsdata->root_cluster;
|
2020-11-22 15:04:47 +00:00
|
|
|
itr->start_clust = parent->fsdata->root_cluster;
|
2017-09-25 19:06:33 +00:00
|
|
|
itr->is_root = 1;
|
2017-09-09 17:15:53 +00:00
|
|
|
}
|
|
|
|
itr->dent = NULL;
|
|
|
|
itr->remaining = 0;
|
|
|
|
itr->last_cluster = 0;
|
|
|
|
}
|
|
|
|
|
2020-11-22 08:19:52 +00:00
|
|
|
/**
|
|
|
|
* fat_next_cluster() - load next FAT cluster
|
|
|
|
*
|
|
|
|
* The function is used when iterating through directories. It loads the
|
|
|
|
* next cluster with directory entries
|
|
|
|
*
|
|
|
|
* @itr: directory iterator
|
|
|
|
* @nbytes: number of bytes read, 0 on error
|
|
|
|
* Return: first directory entry, NULL on error
|
|
|
|
*/
|
|
|
|
void *fat_next_cluster(fat_itr *itr, unsigned int *nbytes)
|
2017-09-09 17:15:53 +00:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
u32 sect;
|
2019-02-27 10:55:57 +00:00
|
|
|
u32 read_size;
|
2017-09-09 17:15:53 +00:00
|
|
|
|
|
|
|
/* have we reached the end? */
|
|
|
|
if (itr->last_cluster)
|
|
|
|
return NULL;
|
|
|
|
|
2019-02-27 10:55:57 +00:00
|
|
|
if (itr->is_root && itr->fsdata->fatsize != 32) {
|
|
|
|
/*
|
|
|
|
* The root directory is located before the data area and
|
|
|
|
* cannot be indexed using the regular unsigned cluster
|
|
|
|
* numbers (it may start at a "negative" cluster or not at a
|
|
|
|
* cluster boundary at all), so consider itr->next_clust to be
|
|
|
|
* a offset in cluster-sized units from the start of rootdir.
|
|
|
|
*/
|
|
|
|
unsigned sect_offset = itr->next_clust * itr->fsdata->clust_size;
|
|
|
|
unsigned remaining_sects = itr->fsdata->rootdir_size - sect_offset;
|
|
|
|
sect = itr->fsdata->rootdir_sect + sect_offset;
|
|
|
|
/* do not read past the end of rootdir */
|
|
|
|
read_size = min_t(u32, itr->fsdata->clust_size,
|
|
|
|
remaining_sects);
|
|
|
|
} else {
|
|
|
|
sect = clust_to_sect(itr->fsdata, itr->next_clust);
|
|
|
|
read_size = itr->fsdata->clust_size;
|
|
|
|
}
|
2017-09-09 17:15:53 +00:00
|
|
|
|
2020-12-25 13:30:04 +00:00
|
|
|
log_debug("FAT read(sect=%d), clust_size=%d, read_size=%u\n",
|
|
|
|
sect, itr->fsdata->clust_size, read_size);
|
2017-09-09 17:15:53 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* NOTE: do_fat_read_at() had complicated logic to deal w/
|
|
|
|
* vfat names that span multiple clusters in the fat16 case,
|
|
|
|
* which get_dentfromdir() probably also needed (and was
|
|
|
|
* missing). And not entirely sure what fat32 didn't have
|
|
|
|
* the same issue.. We solve that by only caring about one
|
|
|
|
* dent at a time and iteratively constructing the vfat long
|
|
|
|
* name.
|
|
|
|
*/
|
2019-02-27 10:55:57 +00:00
|
|
|
ret = disk_read(sect, read_size, itr->block);
|
2017-09-09 17:15:53 +00:00
|
|
|
if (ret < 0) {
|
|
|
|
debug("Error: reading block\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2019-02-27 10:55:57 +00:00
|
|
|
*nbytes = read_size * itr->fsdata->sect_size;
|
2018-09-11 06:59:00 +00:00
|
|
|
itr->clust = itr->next_clust;
|
2017-09-09 17:15:53 +00:00
|
|
|
if (itr->is_root && itr->fsdata->fatsize != 32) {
|
2018-09-11 06:59:00 +00:00
|
|
|
itr->next_clust++;
|
2019-02-27 10:55:57 +00:00
|
|
|
if (itr->next_clust * itr->fsdata->clust_size >=
|
2017-09-09 17:15:53 +00:00
|
|
|
itr->fsdata->rootdir_size) {
|
2018-09-11 06:59:00 +00:00
|
|
|
debug("nextclust: 0x%x\n", itr->next_clust);
|
2017-09-09 17:15:53 +00:00
|
|
|
itr->last_cluster = 1;
|
|
|
|
}
|
|
|
|
} else {
|
2018-09-11 06:59:00 +00:00
|
|
|
itr->next_clust = get_fatent(itr->fsdata, itr->next_clust);
|
|
|
|
if (CHECK_CLUST(itr->next_clust, itr->fsdata->fatsize)) {
|
|
|
|
debug("nextclust: 0x%x\n", itr->next_clust);
|
2017-09-09 17:15:53 +00:00
|
|
|
itr->last_cluster = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return itr->block;
|
|
|
|
}
|
|
|
|
|
|
|
|
static dir_entry *next_dent(fat_itr *itr)
|
|
|
|
{
|
|
|
|
if (itr->remaining == 0) {
|
2019-02-27 10:55:57 +00:00
|
|
|
unsigned nbytes;
|
2020-11-22 08:19:52 +00:00
|
|
|
struct dir_entry *dent = fat_next_cluster(itr, &nbytes);
|
2017-09-09 17:15:53 +00:00
|
|
|
|
|
|
|
/* have we reached the last cluster? */
|
2018-09-11 06:59:00 +00:00
|
|
|
if (!dent) {
|
|
|
|
/* a sign for no more entries left */
|
|
|
|
itr->dent = NULL;
|
2017-09-09 17:15:53 +00:00
|
|
|
return NULL;
|
2018-09-11 06:59:00 +00:00
|
|
|
}
|
2017-09-09 17:15:53 +00:00
|
|
|
|
|
|
|
itr->remaining = nbytes / sizeof(dir_entry) - 1;
|
|
|
|
itr->dent = dent;
|
|
|
|
} else {
|
|
|
|
itr->remaining--;
|
|
|
|
itr->dent++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* have we reached the last valid entry? */
|
2021-01-20 23:23:33 +00:00
|
|
|
if (itr->dent->nameext.name[0] == 0)
|
2017-09-09 17:15:53 +00:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return itr->dent;
|
|
|
|
}
|
|
|
|
|
|
|
|
static dir_entry *extract_vfat_name(fat_itr *itr)
|
|
|
|
{
|
|
|
|
struct dir_entry *dent = itr->dent;
|
2021-01-20 23:23:33 +00:00
|
|
|
int seqn = itr->dent->nameext.name[0] & ~LAST_LONG_ENTRY_MASK;
|
2017-09-09 17:15:53 +00:00
|
|
|
u8 chksum, alias_checksum = ((dir_slot *)dent)->alias_checksum;
|
|
|
|
int n = 0;
|
|
|
|
|
|
|
|
while (seqn--) {
|
|
|
|
char buf[13];
|
|
|
|
int idx = 0;
|
|
|
|
|
|
|
|
slot2str((dir_slot *)dent, buf, &idx);
|
|
|
|
|
2018-11-26 14:58:13 +00:00
|
|
|
if (n + idx >= sizeof(itr->l_name))
|
|
|
|
return NULL;
|
|
|
|
|
2017-09-09 17:15:53 +00:00
|
|
|
/* shift accumulated long-name up and copy new part in: */
|
|
|
|
memmove(itr->l_name + idx, itr->l_name, n);
|
|
|
|
memcpy(itr->l_name, buf, idx);
|
|
|
|
n += idx;
|
|
|
|
|
|
|
|
dent = next_dent(itr);
|
|
|
|
if (!dent)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
fs: fat: handle deleted directory entries correctly
Unlink test for FAT file system seems to fail at test_unlink2.
(When I added this test, I haven't seen any errors though.)
for example,
===8<===
fs_obj_unlink = ['fat', '/home/akashi/tmp/uboot_sandbox_test/128MB.fat32.img']
def test_unlink2(self, u_boot_console, fs_obj_unlink):
"""
Test Case 2 - delete many files
"""
fs_type,fs_img = fs_obj_unlink
with u_boot_console.log.section('Test Case 2 - unlink (many)'):
output = u_boot_console.run_command('host bind 0 %s' % fs_img)
for i in range(0, 20):
output = u_boot_console.run_command_list([
'%srm host 0:0 dir2/0123456789abcdef%02x' % (fs_type, i),
'%sls host 0:0 dir2/0123456789abcdef%02x' % (fs_type, i)])
assert('' == ''.join(output))
output = u_boot_console.run_command(
'%sls host 0:0 dir2' % fs_type)
> assert('0 file(s), 2 dir(s)' in output)
E AssertionError: assert '0 file(s), 2 dir(s)' in ' ./\r\r\n ../\r\r\n 0 0123456789abcdef11\r\r\n\r\r\n1 file(s), 2 dir(s)'
test/py/tests/test_fs/test_unlink.py:52: AssertionError
===>8===
This can happen when fat_itr_next() wrongly detects an already-
deleted directory entry.
File deletion, which was added in the commit f8240ce95d64 ("fs: fat:
support unlink"), is implemented by marking its entry for a short name
with DELETED_FLAG, but related entry slots for a long file name are kept
unmodified. (So entries will never be actually deleted from media.)
To handle this case correctly, an additional check for a directory slot
will be needed in fat_itr_next().
In addition, I added extra comments about long file name and short file
name format in FAT file system. Although they are not directly related
to the issue, I hope it will be helpful for better understandings
in general.
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
2019-11-26 08:29:31 +00:00
|
|
|
/*
|
|
|
|
* We are now at the short file name entry.
|
|
|
|
* If it is marked as deleted, just skip it.
|
|
|
|
*/
|
2021-01-20 23:23:33 +00:00
|
|
|
if (dent->nameext.name[0] == DELETED_FLAG ||
|
|
|
|
dent->nameext.name[0] == aRING)
|
fs: fat: handle deleted directory entries correctly
Unlink test for FAT file system seems to fail at test_unlink2.
(When I added this test, I haven't seen any errors though.)
for example,
===8<===
fs_obj_unlink = ['fat', '/home/akashi/tmp/uboot_sandbox_test/128MB.fat32.img']
def test_unlink2(self, u_boot_console, fs_obj_unlink):
"""
Test Case 2 - delete many files
"""
fs_type,fs_img = fs_obj_unlink
with u_boot_console.log.section('Test Case 2 - unlink (many)'):
output = u_boot_console.run_command('host bind 0 %s' % fs_img)
for i in range(0, 20):
output = u_boot_console.run_command_list([
'%srm host 0:0 dir2/0123456789abcdef%02x' % (fs_type, i),
'%sls host 0:0 dir2/0123456789abcdef%02x' % (fs_type, i)])
assert('' == ''.join(output))
output = u_boot_console.run_command(
'%sls host 0:0 dir2' % fs_type)
> assert('0 file(s), 2 dir(s)' in output)
E AssertionError: assert '0 file(s), 2 dir(s)' in ' ./\r\r\n ../\r\r\n 0 0123456789abcdef11\r\r\n\r\r\n1 file(s), 2 dir(s)'
test/py/tests/test_fs/test_unlink.py:52: AssertionError
===>8===
This can happen when fat_itr_next() wrongly detects an already-
deleted directory entry.
File deletion, which was added in the commit f8240ce95d64 ("fs: fat:
support unlink"), is implemented by marking its entry for a short name
with DELETED_FLAG, but related entry slots for a long file name are kept
unmodified. (So entries will never be actually deleted from media.)
To handle this case correctly, an additional check for a directory slot
will be needed in fat_itr_next().
In addition, I added extra comments about long file name and short file
name format in FAT file system. Although they are not directly related
to the issue, I hope it will be helpful for better understandings
in general.
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
2019-11-26 08:29:31 +00:00
|
|
|
return NULL;
|
|
|
|
|
2017-09-09 17:15:53 +00:00
|
|
|
itr->l_name[n] = '\0';
|
|
|
|
|
2021-01-20 23:23:33 +00:00
|
|
|
chksum = mkcksum(&dent->nameext);
|
2017-09-09 17:15:53 +00:00
|
|
|
|
|
|
|
/* checksum mismatch could mean deleted file, etc.. skip it: */
|
|
|
|
if (chksum != alias_checksum) {
|
|
|
|
debug("** chksum=%x, alias_checksum=%x, l_name=%s, s_name=%8s.%3s\n",
|
2021-01-20 23:23:33 +00:00
|
|
|
chksum, alias_checksum, itr->l_name, dent->nameext.name,
|
|
|
|
dent->nameext.ext);
|
2017-09-09 17:15:53 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return dent;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* fat_itr_next() - step to the next entry in a directory
|
|
|
|
*
|
|
|
|
* Must be called once on a new iterator before the cursor is valid.
|
|
|
|
*
|
|
|
|
* @itr: the iterator to iterate
|
2022-01-19 17:05:50 +00:00
|
|
|
* Return: boolean, 1 if success or 0 if no more entries in the
|
2017-09-09 17:15:53 +00:00
|
|
|
* current directory
|
|
|
|
*/
|
|
|
|
static int fat_itr_next(fat_itr *itr)
|
|
|
|
{
|
|
|
|
dir_entry *dent;
|
|
|
|
|
|
|
|
itr->name = NULL;
|
|
|
|
|
fs: fat: handle deleted directory entries correctly
Unlink test for FAT file system seems to fail at test_unlink2.
(When I added this test, I haven't seen any errors though.)
for example,
===8<===
fs_obj_unlink = ['fat', '/home/akashi/tmp/uboot_sandbox_test/128MB.fat32.img']
def test_unlink2(self, u_boot_console, fs_obj_unlink):
"""
Test Case 2 - delete many files
"""
fs_type,fs_img = fs_obj_unlink
with u_boot_console.log.section('Test Case 2 - unlink (many)'):
output = u_boot_console.run_command('host bind 0 %s' % fs_img)
for i in range(0, 20):
output = u_boot_console.run_command_list([
'%srm host 0:0 dir2/0123456789abcdef%02x' % (fs_type, i),
'%sls host 0:0 dir2/0123456789abcdef%02x' % (fs_type, i)])
assert('' == ''.join(output))
output = u_boot_console.run_command(
'%sls host 0:0 dir2' % fs_type)
> assert('0 file(s), 2 dir(s)' in output)
E AssertionError: assert '0 file(s), 2 dir(s)' in ' ./\r\r\n ../\r\r\n 0 0123456789abcdef11\r\r\n\r\r\n1 file(s), 2 dir(s)'
test/py/tests/test_fs/test_unlink.py:52: AssertionError
===>8===
This can happen when fat_itr_next() wrongly detects an already-
deleted directory entry.
File deletion, which was added in the commit f8240ce95d64 ("fs: fat:
support unlink"), is implemented by marking its entry for a short name
with DELETED_FLAG, but related entry slots for a long file name are kept
unmodified. (So entries will never be actually deleted from media.)
To handle this case correctly, an additional check for a directory slot
will be needed in fat_itr_next().
In addition, I added extra comments about long file name and short file
name format in FAT file system. Although they are not directly related
to the issue, I hope it will be helpful for better understandings
in general.
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
2019-11-26 08:29:31 +00:00
|
|
|
/*
|
|
|
|
* One logical directory entry consist of following slots:
|
|
|
|
* name[0] Attributes
|
|
|
|
* dent[N - N]: LFN[N - 1] N|0x40 ATTR_VFAT
|
|
|
|
* ...
|
|
|
|
* dent[N - 2]: LFN[1] 2 ATTR_VFAT
|
|
|
|
* dent[N - 1]: LFN[0] 1 ATTR_VFAT
|
|
|
|
* dent[N]: SFN ATTR_ARCH
|
|
|
|
*/
|
|
|
|
|
2017-09-09 17:15:53 +00:00
|
|
|
while (1) {
|
|
|
|
dent = next_dent(itr);
|
2020-11-19 06:44:08 +00:00
|
|
|
if (!dent) {
|
|
|
|
itr->dent_start = NULL;
|
2017-09-09 17:15:53 +00:00
|
|
|
return 0;
|
2020-11-19 06:44:08 +00:00
|
|
|
}
|
|
|
|
itr->dent_rem = itr->remaining;
|
|
|
|
itr->dent_start = itr->dent;
|
|
|
|
itr->dent_clust = itr->clust;
|
2021-01-20 23:23:33 +00:00
|
|
|
if (dent->nameext.name[0] == DELETED_FLAG)
|
2017-09-09 17:15:53 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
if (dent->attr & ATTR_VOLUME) {
|
2018-01-05 00:45:21 +00:00
|
|
|
if ((dent->attr & ATTR_VFAT) == ATTR_VFAT &&
|
2021-01-20 23:23:33 +00:00
|
|
|
(dent->nameext.name[0] & LAST_LONG_ENTRY_MASK)) {
|
fs: fat: handle deleted directory entries correctly
Unlink test for FAT file system seems to fail at test_unlink2.
(When I added this test, I haven't seen any errors though.)
for example,
===8<===
fs_obj_unlink = ['fat', '/home/akashi/tmp/uboot_sandbox_test/128MB.fat32.img']
def test_unlink2(self, u_boot_console, fs_obj_unlink):
"""
Test Case 2 - delete many files
"""
fs_type,fs_img = fs_obj_unlink
with u_boot_console.log.section('Test Case 2 - unlink (many)'):
output = u_boot_console.run_command('host bind 0 %s' % fs_img)
for i in range(0, 20):
output = u_boot_console.run_command_list([
'%srm host 0:0 dir2/0123456789abcdef%02x' % (fs_type, i),
'%sls host 0:0 dir2/0123456789abcdef%02x' % (fs_type, i)])
assert('' == ''.join(output))
output = u_boot_console.run_command(
'%sls host 0:0 dir2' % fs_type)
> assert('0 file(s), 2 dir(s)' in output)
E AssertionError: assert '0 file(s), 2 dir(s)' in ' ./\r\r\n ../\r\r\n 0 0123456789abcdef11\r\r\n\r\r\n1 file(s), 2 dir(s)'
test/py/tests/test_fs/test_unlink.py:52: AssertionError
===>8===
This can happen when fat_itr_next() wrongly detects an already-
deleted directory entry.
File deletion, which was added in the commit f8240ce95d64 ("fs: fat:
support unlink"), is implemented by marking its entry for a short name
with DELETED_FLAG, but related entry slots for a long file name are kept
unmodified. (So entries will never be actually deleted from media.)
To handle this case correctly, an additional check for a directory slot
will be needed in fat_itr_next().
In addition, I added extra comments about long file name and short file
name format in FAT file system. Although they are not directly related
to the issue, I hope it will be helpful for better understandings
in general.
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
2019-11-26 08:29:31 +00:00
|
|
|
/* long file name */
|
2017-09-09 17:15:53 +00:00
|
|
|
dent = extract_vfat_name(itr);
|
fs: fat: handle deleted directory entries correctly
Unlink test for FAT file system seems to fail at test_unlink2.
(When I added this test, I haven't seen any errors though.)
for example,
===8<===
fs_obj_unlink = ['fat', '/home/akashi/tmp/uboot_sandbox_test/128MB.fat32.img']
def test_unlink2(self, u_boot_console, fs_obj_unlink):
"""
Test Case 2 - delete many files
"""
fs_type,fs_img = fs_obj_unlink
with u_boot_console.log.section('Test Case 2 - unlink (many)'):
output = u_boot_console.run_command('host bind 0 %s' % fs_img)
for i in range(0, 20):
output = u_boot_console.run_command_list([
'%srm host 0:0 dir2/0123456789abcdef%02x' % (fs_type, i),
'%sls host 0:0 dir2/0123456789abcdef%02x' % (fs_type, i)])
assert('' == ''.join(output))
output = u_boot_console.run_command(
'%sls host 0:0 dir2' % fs_type)
> assert('0 file(s), 2 dir(s)' in output)
E AssertionError: assert '0 file(s), 2 dir(s)' in ' ./\r\r\n ../\r\r\n 0 0123456789abcdef11\r\r\n\r\r\n1 file(s), 2 dir(s)'
test/py/tests/test_fs/test_unlink.py:52: AssertionError
===>8===
This can happen when fat_itr_next() wrongly detects an already-
deleted directory entry.
File deletion, which was added in the commit f8240ce95d64 ("fs: fat:
support unlink"), is implemented by marking its entry for a short name
with DELETED_FLAG, but related entry slots for a long file name are kept
unmodified. (So entries will never be actually deleted from media.)
To handle this case correctly, an additional check for a directory slot
will be needed in fat_itr_next().
In addition, I added extra comments about long file name and short file
name format in FAT file system. Although they are not directly related
to the issue, I hope it will be helpful for better understandings
in general.
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
2019-11-26 08:29:31 +00:00
|
|
|
/*
|
|
|
|
* If succeeded, dent has a valid short file
|
|
|
|
* name entry for the current entry.
|
|
|
|
* If failed, itr points to a current bogus
|
|
|
|
* entry. So after fetching a next one,
|
|
|
|
* it may have a short file name entry
|
|
|
|
* for this bogus entry so that we can still
|
|
|
|
* check for a short name.
|
|
|
|
*/
|
2017-09-09 17:15:53 +00:00
|
|
|
if (!dent)
|
|
|
|
continue;
|
|
|
|
itr->name = itr->l_name;
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
/* Volume label or VFAT entry, skip */
|
|
|
|
continue;
|
|
|
|
}
|
2020-06-09 07:09:07 +00:00
|
|
|
}
|
2017-09-09 17:15:53 +00:00
|
|
|
|
fs: fat: handle deleted directory entries correctly
Unlink test for FAT file system seems to fail at test_unlink2.
(When I added this test, I haven't seen any errors though.)
for example,
===8<===
fs_obj_unlink = ['fat', '/home/akashi/tmp/uboot_sandbox_test/128MB.fat32.img']
def test_unlink2(self, u_boot_console, fs_obj_unlink):
"""
Test Case 2 - delete many files
"""
fs_type,fs_img = fs_obj_unlink
with u_boot_console.log.section('Test Case 2 - unlink (many)'):
output = u_boot_console.run_command('host bind 0 %s' % fs_img)
for i in range(0, 20):
output = u_boot_console.run_command_list([
'%srm host 0:0 dir2/0123456789abcdef%02x' % (fs_type, i),
'%sls host 0:0 dir2/0123456789abcdef%02x' % (fs_type, i)])
assert('' == ''.join(output))
output = u_boot_console.run_command(
'%sls host 0:0 dir2' % fs_type)
> assert('0 file(s), 2 dir(s)' in output)
E AssertionError: assert '0 file(s), 2 dir(s)' in ' ./\r\r\n ../\r\r\n 0 0123456789abcdef11\r\r\n\r\r\n1 file(s), 2 dir(s)'
test/py/tests/test_fs/test_unlink.py:52: AssertionError
===>8===
This can happen when fat_itr_next() wrongly detects an already-
deleted directory entry.
File deletion, which was added in the commit f8240ce95d64 ("fs: fat:
support unlink"), is implemented by marking its entry for a short name
with DELETED_FLAG, but related entry slots for a long file name are kept
unmodified. (So entries will never be actually deleted from media.)
To handle this case correctly, an additional check for a directory slot
will be needed in fat_itr_next().
In addition, I added extra comments about long file name and short file
name format in FAT file system. Although they are not directly related
to the issue, I hope it will be helpful for better understandings
in general.
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
2019-11-26 08:29:31 +00:00
|
|
|
/* short file name */
|
2017-09-09 17:15:53 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
get_name(dent, itr->s_name);
|
|
|
|
if (!itr->name)
|
|
|
|
itr->name = itr->s_name;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* fat_itr_isdir() - is current cursor position pointing to a directory
|
|
|
|
*
|
|
|
|
* @itr: the iterator
|
2022-01-19 17:05:50 +00:00
|
|
|
* Return: true if cursor is at a directory
|
2017-09-09 17:15:53 +00:00
|
|
|
*/
|
|
|
|
static int fat_itr_isdir(fat_itr *itr)
|
|
|
|
{
|
|
|
|
return !!(itr->dent->attr & ATTR_DIR);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Helpers:
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define TYPE_FILE 0x1
|
|
|
|
#define TYPE_DIR 0x2
|
|
|
|
#define TYPE_ANY (TYPE_FILE | TYPE_DIR)
|
|
|
|
|
|
|
|
/**
|
|
|
|
* fat_itr_resolve() - traverse directory structure to resolve the
|
|
|
|
* requested path.
|
|
|
|
*
|
|
|
|
* Traverse directory structure to the requested path. If the specified
|
|
|
|
* path is to a directory, this will descend into the directory and
|
|
|
|
* leave it iterator at the start of the directory. If the path is to a
|
|
|
|
* file, it will leave the iterator in the parent directory with current
|
|
|
|
* cursor at file's entry in the directory.
|
|
|
|
*
|
|
|
|
* @itr: iterator initialized to root
|
|
|
|
* @path: the requested path
|
|
|
|
* @type: bitmask of allowable file types
|
2022-01-19 17:05:50 +00:00
|
|
|
* Return: 0 on success or -errno
|
2017-09-09 17:15:53 +00:00
|
|
|
*/
|
|
|
|
static int fat_itr_resolve(fat_itr *itr, const char *path, unsigned type)
|
|
|
|
{
|
|
|
|
const char *next;
|
|
|
|
|
|
|
|
/* chomp any extra leading slashes: */
|
|
|
|
while (path[0] && ISDIRDELIM(path[0]))
|
|
|
|
path++;
|
|
|
|
|
|
|
|
/* are we at the end? */
|
|
|
|
if (strlen(path) == 0) {
|
|
|
|
if (!(type & TYPE_DIR))
|
|
|
|
return -ENOENT;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* find length of next path entry: */
|
|
|
|
next = path;
|
|
|
|
while (next[0] && !ISDIRDELIM(next[0]))
|
|
|
|
next++;
|
|
|
|
|
2018-09-11 06:58:59 +00:00
|
|
|
if (itr->is_root) {
|
|
|
|
/* root dir doesn't have "." nor ".." */
|
|
|
|
if ((((next - path) == 1) && !strncmp(path, ".", 1)) ||
|
|
|
|
(((next - path) == 2) && !strncmp(path, "..", 2))) {
|
|
|
|
/* point back to itself */
|
|
|
|
itr->clust = itr->fsdata->root_cluster;
|
2018-09-11 06:59:00 +00:00
|
|
|
itr->next_clust = itr->fsdata->root_cluster;
|
2020-11-22 15:04:47 +00:00
|
|
|
itr->start_clust = itr->fsdata->root_cluster;
|
2018-09-11 06:58:59 +00:00
|
|
|
itr->dent = NULL;
|
|
|
|
itr->remaining = 0;
|
|
|
|
itr->last_cluster = 0;
|
|
|
|
|
|
|
|
if (next[0] == 0) {
|
|
|
|
if (type & TYPE_DIR)
|
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
return -ENOENT;
|
|
|
|
}
|
|
|
|
|
|
|
|
return fat_itr_resolve(itr, next, type);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-09-09 17:15:53 +00:00
|
|
|
while (fat_itr_next(itr)) {
|
|
|
|
int match = 0;
|
|
|
|
unsigned n = max(strlen(itr->name), (size_t)(next - path));
|
|
|
|
|
|
|
|
/* check both long and short name: */
|
|
|
|
if (!strncasecmp(path, itr->name, n))
|
|
|
|
match = 1;
|
|
|
|
else if (itr->name != itr->s_name &&
|
|
|
|
!strncasecmp(path, itr->s_name, n))
|
|
|
|
match = 1;
|
|
|
|
|
|
|
|
if (!match)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (fat_itr_isdir(itr)) {
|
|
|
|
/* recurse into directory: */
|
|
|
|
fat_itr_child(itr, itr);
|
|
|
|
return fat_itr_resolve(itr, next, type);
|
|
|
|
} else if (next[0]) {
|
|
|
|
/*
|
|
|
|
* If next is not empty then we have a case
|
|
|
|
* like: /path/to/realfile/nonsense
|
|
|
|
*/
|
|
|
|
debug("bad trailing path: %s\n", next);
|
|
|
|
return -ENOENT;
|
|
|
|
} else if (!(type & TYPE_FILE)) {
|
|
|
|
return -ENOTDIR;
|
|
|
|
} else {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return -ENOENT;
|
|
|
|
}
|
|
|
|
|
2012-07-20 13:18:44 +00:00
|
|
|
int file_fat_detectfs(void)
|
2003-06-15 22:40:42 +00:00
|
|
|
{
|
2010-07-19 09:37:00 +00:00
|
|
|
boot_sector bs;
|
|
|
|
volume_info volinfo;
|
|
|
|
int fatsize;
|
|
|
|
char vol_label[12];
|
2003-06-15 22:40:42 +00:00
|
|
|
|
2010-07-19 09:37:00 +00:00
|
|
|
if (cur_dev == NULL) {
|
2003-09-10 22:30:53 +00:00
|
|
|
printf("No current device\n");
|
|
|
|
return 1;
|
|
|
|
}
|
2010-07-19 09:37:00 +00:00
|
|
|
|
2021-01-25 11:53:14 +00:00
|
|
|
if (IS_ENABLED(CONFIG_HAVE_BLOCK_DEVICE)) {
|
|
|
|
printf("Interface: %s\n", blk_get_if_type_name(cur_dev->if_type));
|
|
|
|
printf(" Device %d: ", cur_dev->devnum);
|
|
|
|
dev_print(cur_dev);
|
2003-09-10 22:30:53 +00:00
|
|
|
}
|
2010-07-19 09:37:00 +00:00
|
|
|
|
|
|
|
if (read_bootsectandvi(&bs, &volinfo, &fatsize)) {
|
2003-09-10 22:30:53 +00:00
|
|
|
printf("\nNo valid FAT fs found\n");
|
|
|
|
return 1;
|
|
|
|
}
|
2010-07-19 09:37:00 +00:00
|
|
|
|
|
|
|
memcpy(vol_label, volinfo.volume_label, 11);
|
2003-09-10 22:30:53 +00:00
|
|
|
vol_label[11] = '\0';
|
2010-07-19 09:37:00 +00:00
|
|
|
volinfo.fs_type[5] = '\0';
|
|
|
|
|
2012-10-17 06:44:57 +00:00
|
|
|
printf("Filesystem: %s \"%s\"\n", volinfo.fs_type, vol_label);
|
2010-07-19 09:37:00 +00:00
|
|
|
|
2003-09-10 22:30:53 +00:00
|
|
|
return 0;
|
2003-06-15 22:40:42 +00:00
|
|
|
}
|
|
|
|
|
2014-02-03 20:21:10 +00:00
|
|
|
int fat_exists(const char *filename)
|
|
|
|
{
|
2017-09-09 17:15:54 +00:00
|
|
|
fsdata fsdata;
|
2017-09-22 11:37:43 +00:00
|
|
|
fat_itr *itr;
|
2014-11-17 22:39:35 +00:00
|
|
|
int ret;
|
|
|
|
|
2017-09-30 23:25:21 +00:00
|
|
|
itr = malloc_cache_aligned(sizeof(fat_itr));
|
2017-09-30 23:25:22 +00:00
|
|
|
if (!itr)
|
|
|
|
return 0;
|
2017-09-09 17:15:54 +00:00
|
|
|
ret = fat_itr_root(itr, &fsdata);
|
|
|
|
if (ret)
|
2017-09-30 23:25:22 +00:00
|
|
|
goto out;
|
2017-09-09 17:15:54 +00:00
|
|
|
|
|
|
|
ret = fat_itr_resolve(itr, filename, TYPE_ANY);
|
2017-09-12 20:40:01 +00:00
|
|
|
free(fsdata.fatbuf);
|
2017-09-30 23:25:22 +00:00
|
|
|
out:
|
2017-09-22 11:37:43 +00:00
|
|
|
free(itr);
|
2014-11-17 22:39:35 +00:00
|
|
|
return ret == 0;
|
2014-02-03 20:21:10 +00:00
|
|
|
}
|
|
|
|
|
2021-05-15 20:06:16 +00:00
|
|
|
/**
|
|
|
|
* fat2rtc() - convert FAT time stamp to RTC file stamp
|
|
|
|
*
|
|
|
|
* @date: FAT date
|
|
|
|
* @time: FAT time
|
|
|
|
* @tm: RTC time stamp
|
|
|
|
*/
|
|
|
|
static void __maybe_unused fat2rtc(u16 date, u16 time, struct rtc_time *tm)
|
|
|
|
{
|
|
|
|
tm->tm_mday = date & 0x1f;
|
|
|
|
tm->tm_mon = (date & 0x1e0) >> 4;
|
|
|
|
tm->tm_year = (date >> 9) + 1980;
|
|
|
|
|
|
|
|
tm->tm_sec = (time & 0x1f) << 1;
|
|
|
|
tm->tm_min = (time & 0x7e0) >> 5;
|
|
|
|
tm->tm_hour = time >> 11;
|
|
|
|
|
|
|
|
rtc_calc_weekday(tm);
|
|
|
|
tm->tm_yday = 0;
|
|
|
|
tm->tm_isdst = 0;
|
|
|
|
}
|
|
|
|
|
2014-11-17 22:39:38 +00:00
|
|
|
int fat_size(const char *filename, loff_t *size)
|
2014-06-11 18:47:26 +00:00
|
|
|
{
|
2017-09-09 17:15:54 +00:00
|
|
|
fsdata fsdata;
|
2017-09-22 11:37:43 +00:00
|
|
|
fat_itr *itr;
|
2017-09-09 17:15:54 +00:00
|
|
|
int ret;
|
|
|
|
|
2017-09-30 23:25:21 +00:00
|
|
|
itr = malloc_cache_aligned(sizeof(fat_itr));
|
2017-09-30 23:25:22 +00:00
|
|
|
if (!itr)
|
|
|
|
return -ENOMEM;
|
2017-09-09 17:15:54 +00:00
|
|
|
ret = fat_itr_root(itr, &fsdata);
|
|
|
|
if (ret)
|
2017-09-30 23:25:22 +00:00
|
|
|
goto out_free_itr;
|
2017-09-09 17:15:54 +00:00
|
|
|
|
|
|
|
ret = fat_itr_resolve(itr, filename, TYPE_FILE);
|
|
|
|
if (ret) {
|
|
|
|
/*
|
|
|
|
* Directories don't have size, but fs_size() is not
|
|
|
|
* expected to fail if passed a directory path:
|
|
|
|
*/
|
2017-09-12 20:40:01 +00:00
|
|
|
free(fsdata.fatbuf);
|
2019-05-16 14:34:31 +00:00
|
|
|
ret = fat_itr_root(itr, &fsdata);
|
|
|
|
if (ret)
|
|
|
|
goto out_free_itr;
|
|
|
|
ret = fat_itr_resolve(itr, filename, TYPE_DIR);
|
|
|
|
if (!ret)
|
2017-09-09 17:15:54 +00:00
|
|
|
*size = 0;
|
2017-09-30 23:25:22 +00:00
|
|
|
goto out_free_both;
|
2017-09-09 17:15:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
*size = FAT2CPU32(itr->dent->size);
|
2017-09-30 23:25:22 +00:00
|
|
|
out_free_both:
|
2017-09-12 20:40:01 +00:00
|
|
|
free(fsdata.fatbuf);
|
2017-09-30 23:25:22 +00:00
|
|
|
out_free_itr:
|
2017-09-22 11:37:43 +00:00
|
|
|
free(itr);
|
2017-09-12 20:40:01 +00:00
|
|
|
return ret;
|
2014-06-11 18:47:26 +00:00
|
|
|
}
|
|
|
|
|
2014-11-17 22:39:35 +00:00
|
|
|
int file_fat_read_at(const char *filename, loff_t pos, void *buffer,
|
|
|
|
loff_t maxsize, loff_t *actread)
|
2003-06-15 22:40:42 +00:00
|
|
|
{
|
2017-09-09 17:15:54 +00:00
|
|
|
fsdata fsdata;
|
2017-09-22 11:37:43 +00:00
|
|
|
fat_itr *itr;
|
2017-09-09 17:15:54 +00:00
|
|
|
int ret;
|
|
|
|
|
2017-09-30 23:25:21 +00:00
|
|
|
itr = malloc_cache_aligned(sizeof(fat_itr));
|
2017-09-30 23:25:22 +00:00
|
|
|
if (!itr)
|
|
|
|
return -ENOMEM;
|
2017-09-09 17:15:54 +00:00
|
|
|
ret = fat_itr_root(itr, &fsdata);
|
|
|
|
if (ret)
|
2017-09-30 23:25:22 +00:00
|
|
|
goto out_free_itr;
|
2017-09-09 17:15:54 +00:00
|
|
|
|
|
|
|
ret = fat_itr_resolve(itr, filename, TYPE_FILE);
|
|
|
|
if (ret)
|
2017-09-30 23:25:22 +00:00
|
|
|
goto out_free_both;
|
2017-09-09 17:15:54 +00:00
|
|
|
|
2018-08-14 02:35:15 +00:00
|
|
|
debug("reading %s at pos %llu\n", filename, pos);
|
2019-02-11 06:56:20 +00:00
|
|
|
|
|
|
|
/* For saving default max clustersize memory allocated to malloc pool */
|
|
|
|
dir_entry *dentptr = itr->dent;
|
|
|
|
|
|
|
|
ret = get_contents(&fsdata, dentptr, pos, buffer, maxsize, actread);
|
2017-09-12 20:40:01 +00:00
|
|
|
|
2017-09-30 23:25:22 +00:00
|
|
|
out_free_both:
|
2017-09-12 20:40:01 +00:00
|
|
|
free(fsdata.fatbuf);
|
2017-09-30 23:25:22 +00:00
|
|
|
out_free_itr:
|
2017-09-22 11:37:43 +00:00
|
|
|
free(itr);
|
2017-09-12 20:40:01 +00:00
|
|
|
return ret;
|
2012-09-18 08:14:56 +00:00
|
|
|
}
|
|
|
|
|
2014-11-17 22:39:35 +00:00
|
|
|
int file_fat_read(const char *filename, void *buffer, int maxsize)
|
2012-09-18 08:14:56 +00:00
|
|
|
{
|
2014-11-17 22:39:35 +00:00
|
|
|
loff_t actread;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = file_fat_read_at(filename, 0, buffer, maxsize, &actread);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
else
|
|
|
|
return actread;
|
2003-06-15 22:40:42 +00:00
|
|
|
}
|
2012-12-26 09:53:33 +00:00
|
|
|
|
2014-11-17 22:39:38 +00:00
|
|
|
int fat_read_file(const char *filename, void *buf, loff_t offset, loff_t len,
|
|
|
|
loff_t *actread)
|
2012-12-26 09:53:33 +00:00
|
|
|
{
|
2014-11-17 22:39:35 +00:00
|
|
|
int ret;
|
2012-12-26 09:53:33 +00:00
|
|
|
|
2014-11-17 22:39:38 +00:00
|
|
|
ret = file_fat_read_at(filename, offset, buf, len, actread);
|
|
|
|
if (ret)
|
2012-12-26 09:53:33 +00:00
|
|
|
printf("** Unable to read file %s **\n", filename);
|
|
|
|
|
2014-11-17 22:39:38 +00:00
|
|
|
return ret;
|
2012-12-26 09:53:33 +00:00
|
|
|
}
|
|
|
|
|
2017-09-09 17:15:56 +00:00
|
|
|
typedef struct {
|
|
|
|
struct fs_dir_stream parent;
|
|
|
|
struct fs_dirent dirent;
|
|
|
|
fsdata fsdata;
|
|
|
|
fat_itr itr;
|
|
|
|
} fat_dir;
|
|
|
|
|
|
|
|
int fat_opendir(const char *filename, struct fs_dir_stream **dirsp)
|
|
|
|
{
|
2017-11-24 08:54:41 +00:00
|
|
|
fat_dir *dir;
|
2017-09-09 17:15:56 +00:00
|
|
|
int ret;
|
|
|
|
|
2017-11-24 08:54:41 +00:00
|
|
|
dir = malloc_cache_aligned(sizeof(*dir));
|
2017-09-09 17:15:56 +00:00
|
|
|
if (!dir)
|
|
|
|
return -ENOMEM;
|
2017-11-24 08:54:41 +00:00
|
|
|
memset(dir, 0, sizeof(*dir));
|
2017-09-09 17:15:56 +00:00
|
|
|
|
|
|
|
ret = fat_itr_root(&dir->itr, &dir->fsdata);
|
|
|
|
if (ret)
|
2017-09-30 23:25:22 +00:00
|
|
|
goto fail_free_dir;
|
2017-09-09 17:15:56 +00:00
|
|
|
|
|
|
|
ret = fat_itr_resolve(&dir->itr, filename, TYPE_DIR);
|
|
|
|
if (ret)
|
2017-09-30 23:25:22 +00:00
|
|
|
goto fail_free_both;
|
2017-09-09 17:15:56 +00:00
|
|
|
|
|
|
|
*dirsp = (struct fs_dir_stream *)dir;
|
|
|
|
return 0;
|
|
|
|
|
2017-09-30 23:25:22 +00:00
|
|
|
fail_free_both:
|
2017-09-12 20:40:01 +00:00
|
|
|
free(dir->fsdata.fatbuf);
|
2017-09-30 23:25:22 +00:00
|
|
|
fail_free_dir:
|
2017-09-09 17:15:56 +00:00
|
|
|
free(dir);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int fat_readdir(struct fs_dir_stream *dirs, struct fs_dirent **dentp)
|
|
|
|
{
|
|
|
|
fat_dir *dir = (fat_dir *)dirs;
|
|
|
|
struct fs_dirent *dent = &dir->dirent;
|
|
|
|
|
|
|
|
if (!fat_itr_next(&dir->itr))
|
|
|
|
return -ENOENT;
|
|
|
|
|
|
|
|
memset(dent, 0, sizeof(*dent));
|
|
|
|
strcpy(dent->name, dir->itr.name);
|
2021-05-15 20:06:16 +00:00
|
|
|
if (CONFIG_IS_ENABLED(EFI_LOADER)) {
|
|
|
|
dent->attr = dir->itr.dent->attr;
|
|
|
|
fat2rtc(le16_to_cpu(dir->itr.dent->cdate),
|
|
|
|
le16_to_cpu(dir->itr.dent->ctime), &dent->create_time);
|
|
|
|
fat2rtc(le16_to_cpu(dir->itr.dent->date),
|
|
|
|
le16_to_cpu(dir->itr.dent->time), &dent->change_time);
|
|
|
|
fat2rtc(le16_to_cpu(dir->itr.dent->adate),
|
|
|
|
0, &dent->access_time);
|
|
|
|
}
|
2017-09-09 17:15:56 +00:00
|
|
|
if (fat_itr_isdir(&dir->itr)) {
|
|
|
|
dent->type = FS_DT_DIR;
|
|
|
|
} else {
|
|
|
|
dent->type = FS_DT_REG;
|
|
|
|
dent->size = FAT2CPU32(dir->itr.dent->size);
|
|
|
|
}
|
|
|
|
|
|
|
|
*dentp = dent;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void fat_closedir(struct fs_dir_stream *dirs)
|
|
|
|
{
|
|
|
|
fat_dir *dir = (fat_dir *)dirs;
|
2017-09-12 20:40:01 +00:00
|
|
|
free(dir->fsdata.fatbuf);
|
2017-09-09 17:15:56 +00:00
|
|
|
free(dir);
|
|
|
|
}
|
|
|
|
|
2012-12-26 09:53:33 +00:00
|
|
|
void fat_close(void)
|
|
|
|
{
|
|
|
|
}
|
2020-12-30 23:38:13 +00:00
|
|
|
|
|
|
|
int fat_uuid(char *uuid_str)
|
|
|
|
{
|
|
|
|
boot_sector bs;
|
|
|
|
volume_info volinfo;
|
|
|
|
int fatsize;
|
|
|
|
int ret;
|
|
|
|
u8 *id;
|
|
|
|
|
|
|
|
ret = read_bootsectandvi(&bs, &volinfo, &fatsize);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
id = volinfo.volume_id;
|
|
|
|
sprintf(uuid_str, "%02X%02X-%02X%02X", id[3], id[2], id[1], id[0]);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|