fat: Replaced 11 magic to MSDOS_NAME for volume label
PATCH 1/1 fat: Replaced 11 magic to MSDOS_NAME for volume label
The FAT file system volume label file stored in the root directory should match the volume label field in the FAT boot sector. As consequence, the max length of these fields ought to be the same. This patch replaces the magic '11' usef in the struct fat_boot_sector with MSDOS_NAME, which is used in struct msdos_dir_entry.
Please check the following references:
1. Microsoft FAT specification 2005
(http://read.pudn.com/downloads77/ebook/294884/FAT32%20Spec%20%28SDA%20Contribution%29.pdf).
Search for 'volume label'.
2. Microsoft Extensible Firmware Initiative, FAT32 File System Specification
(https://staff.washington.edu/dittrich/misc/fatgen103.pdf).
Search for 'volume label'.
3. User space code that creates FAT filesystem
sometimes uses MSDOS_NAME for the label, sometimes not.
Search for 'if (memcmp(label, NO_NAME, MSDOS_NAME))'.
I consider to make the same patch there as well.
https://github.com/dosfstools/dosfstools/blob/master/src/mkfs.fat.c
--- include/uapi/linux/msdos_fs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/msdos_fs.h +2 -2
@@ -135,7 +135,7 @@ struct fat_boot_sector {for mount state. */ __u8 signature;/* extended boot signature */ __u8 vol_id[4 ];/* volume ID */ -__u8 vol_label[11 ];/* volume label */ +__u8 vol_label[MSDOS_NAME ];/* volume label */ __u8 fs_type[8 ];/* file system type */ /* other fields are not added here */ } fat16;
@@ -158,7 +158,7 @@ struct fat_boot_sector {for mount state. */ __u8 signature;/* extended boot signature */ __u8 vol_id[4 ];/* volume ID */ -__u8 vol_label[11 ];/* volume label */ +__u8 vol_label[MSDOS_NAME ];/* volume label */ __u8 fs_type[8 ];/* file system type */ /* other fields are not added here */ } fat32;
Signature · 1 line
2.7.4
Quoted 9 lines · Carmeli Tamir
The FAT file system volume label file stored in the root directory should match the volume label field in the FAT boot sector. As consequence, the max length of these fields ought to be the same. This patch replaces the magic '11' usef in the struct
fat_boot_sectorwithMSDOS_NAME, which is used in structmsdos_dir_entry.Please check the following references:
1. Microsoft FAT specification 2005
(http://read.pudn.com/downloads77/ebook/294884/FAT32%20Spec%20%28SDA%20Contribution%29.pdf).
[..]
Quoted 1 line
Signed-off-by Carmeli Tamir <[email protected]>
Looks good to me,
-ss
Looks good,
Signature · 6 lines
Johannes Thumshirn SUSE Labs [email protected] +49 911 74053 689 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg) Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
Thanks for the reply and sorry for my noob question:
Wasn't I supposed to send this patch also to the FAT maintainer, OGAWA Hirofumi? His name wasn't on the get_maintainer output, and I think that this specific file isn't listed anywhere under the maintainers file.
Quoted 10 lines · Johannes Thumshirn
Looks good,
Reviewed-by Johannes Thumshirn <[email protected]>--
Johannes Thumshirn SUSE Labs
[email protected] +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
Quoted 3 lines · Tamir Carmeli
Thanks for the reply and sorry for my noob question:
Wasn't I supposed to send this patch also to the FAT maintainer, OGAWA Hirofumi?
Yes.
Quoted 3 lines
His name wasn't on the
get_maintaineroutput, and I think that this specific file isn't listed anywhere under the maintainers file.
Right. Not all headers are tracked; so usually you'd want to ./scripts/get_maintainer.pl fs/fat (where C files are).
-ss
Quoted 19 lines · Carmeli Tamir
The FAT file system volume label file stored in the root directory should match the volume label field in the FAT boot sector. As consequence, the max length of these fields ought to be the same. This patch replaces the magic '11' usef in the struct
fat_boot_sectorwithMSDOS_NAME, which is used in structmsdos_dir_entry.Please check the following references:
1. Microsoft FAT specification 2005
(http://read.pudn.com/downloads77/ebook/294884/FAT32%20Spec%20%28SDA%20Contribution%29.pdf).
Search for 'volume label'.
2. Microsoft Extensible Firmware Initiative, FAT32 File System Specification
(https://staff.washington.edu/dittrich/misc/fatgen103.pdf).
Search for 'volume label'.
3. User space code that creates FAT filesystem
sometimes usesMSDOS_NAMEfor the label, sometimes not.
Search for 'if (memcmp(label, NO_NAME, MSDOS_NAME))'.
I consider to make the same patch there as well.
https://github.com/dosfstools/dosfstools/blob/master/src/mkfs.fat.c
Quoted 1 line
Signed-off-by Carmeli Tamir <[email protected]>
Looks good. Thanks.
Quoted 26 lines
--- include/uapi/linux/msdos_fs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)include/uapi/linux/msdos_fs.h +2
-2@@ -135,7 +135,7 @@ struct fat_boot_sector {for mount state. */ __u8 signature;/* extended boot signature */ __u8 vol_id[4 ];/* volume ID */ -__u8 vol_label[11 ];/* volume label */ +__u8 vol_label[MSDOS_NAME ];/* volume label */ __u8 fs_type[8 ];/* file system type */ /* other fields are not added here */ } fat16;@@ -158,7 +158,7 @@ struct fat_boot_sector {for mount state. */ __u8 signature;/* extended boot signature */ __u8 vol_id[4 ];/* volume ID */ -__u8 vol_label[11 ];/* volume label */ +__u8 vol_label[MSDOS_NAME ];/* volume label */ __u8 fs_type[8 ];/* file system type */ /* other fields are not added here */ } fat32;
Signature · 1 line
OGAWA Hirofumi <[email protected]>