Skip to contentSkip to conversation

vfat: don't read garbage after last dirent

PATCH Superseded Matteo Croce 2 participants 3 messages Dec 16, 2018 – Dec 26, 2018

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 vfat: don't read garbage after last dirent

The FAT32 File System Specification[1] states that:

If DIR_Name[0] == 0x00, then the directory entry is free, and there are no allocated directory entries after this one.

The special 0 value, indicates to FAT file system driver code that the rest of the entries in this directory do not need to be examined because they are all free.

This is not enforced by Linux, and is possible to read garbage if not all dirents after the last one are filled with zeroes.

[1] http://download.microsoft.com/download/1/6/1/161ba512-40e2-4cc9-843a-923143f3456c/fatgen103.doc

---
v2:
* add the check also in lookup and dir empty check
* fix two tipos in the commit message

 fs/fat/dir.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
fs/fat/dir.c +4 -3
index c8366cb8eccd..955edf5df286 100644
@@ -588,7 +588,7 @@ static int __fat_readdir(struct inode *inode, struct file *file,
 
 	bh = NULL;
 get_new:
-	if (fat_get_entry(inode, &cpos, &bh, &de) == -1)
+	if (fat_get_entry(inode, &cpos, &bh, &de) == -1 || !de->name[0])
 		goto end_of_dir;
 parse_record:
 	nr_slots = 0;
@@ -916,7 +916,8 @@ int fat_dir_empty(struct inode *dir)
 
 	bh = NULL;
 	cpos = 0;
-	while (fat_get_short_entry(dir, &cpos, &bh, &de) >= 0) {
+	while (fat_get_short_entry(dir, &cpos, &bh, &de) >= 0 &&
+	       de->name[0]) {
 		if (strncmp(de->name, MSDOS_DOT   , MSDOS_NAME) &&
 		    strncmp(de->name, MSDOS_DOTDOT, MSDOS_NAME)) {
 			result = -ENOTEMPTY;
@@ -961,7 +962,7 @@ int fat_scan(struct inode *dir, const unsigned char *name,
 	sinfo->slot_off = 0;
 	sinfo->bh = NULL;
 	while (fat_get_short_entry(dir, &sinfo->slot_off, &sinfo->bh,
-				   &sinfo->de) >= 0) {
+				   &sinfo->de) >= 0 && sinfo->de->name[0]) {
 		if (!strncmp(sinfo->de->name, name, MSDOS_NAME)) {
 			sinfo->slot_off -= sizeof(*sinfo->de);
 			sinfo->nr_slots = 1;
Signature · 1 line
2.19.2
maintainer
#1 lore raw
Quoted 9 lines · Matteo Croce

The FAT32 File System Specification[1] states that:

If DIR_Name[0] == 0x00, then the directory entry is free, and there are no allocated directory entries after this one.

The special 0 value, indicates to FAT file system driver code that the rest of the entries in this directory do not need to be examined because they are all free.

Quoted 7 lines

This is not enforced by Linux, and is possible to read garbage if not all dirents after the last one are filled with zeroes.

[1] http://download.microsoft.com/download/1/6/1/161ba512-40e2-4cc9-843a-923143f3456c/fatgen103.doc

We have to handle all paths that is using fat_get_entry(), to make consistent behavior.

With quick check, there are still several issues remaining. Please check more. For example, looks like fat_parse_long()/fat_search_long() path is missing, and fat_get_dotdot_entry(), fat_subdirs() too.

(while adding new entry, if we found zeroed entry, we would be better to warn about fsck.)

Thanks.

Signature · 1 line
OGAWA Hirofumi <[email protected]>
#2 lore raw
Quoted 20 lines · OGAWA Hirofumi
Quoted 9 lines · Matteo Croce

The FAT32 File System Specification[1] states that:

If DIR_Name[0] == 0x00, then the directory entry is free, and there are no allocated directory entries after this one.

The special 0 value, indicates to FAT file system driver code that the rest of the entries in this directory do not need to be examined because they are all free.

Quoted 7 lines

This is not enforced by Linux, and is possible to read garbage if not all dirents after the last one are filled with zeroes.

[1] http://download.microsoft.com/download/1/6/1/161ba512-40e2-4cc9-843a-923143f3456c/fatgen103.doc

Quoted 7 lines

We have to handle all paths that is using fat_get_entry(), to make consistent behavior.

With quick check, there are still several issues remaining. Please check more. For example, looks like fat_parse_long()/fat_search_long() path is missing, and fat_get_dotdot_entry(), fat_subdirs() too.

If I put the check in fat_get_short_entry(), then fat_get_dotdot_entry() and fat_subdirs() are covered too. Is there any drawback in doing this?

Quoted 3 lines

(while adding new entry, if we found zeroed entry, we would be better to warn about fsck.)

Ok

Quoted 3 lines

Thanks.
--
OGAWA Hirofumi <[email protected]>

Thanks,

Signature · 2 lines
Matteo Croce
per aspera ad upstream