exfat: redefine PBR as boot_sector
Subsystems (2)
PATCH v2 1/4 exfat: redefine PBR as boot_sector
Aggregate PBR related definitions and redefine as "boot_sector" to comply with the exFAT specification.
And, rename variable names including 'pbr'.
---
Changes in v2:
- rebase with patch 'optimize dir-cache' applied
fs/exfat/exfat_fs.h | 2 +- fs/exfat/exfat_raw.h | 79 +++++++++++++++-------------------------- fs/exfat/super.c | 84 ++++++++++++++++++++++---------------------- 3 files changed, 72 insertions(+), 93 deletions(-)
fs/exfat/exfat_fs.h +1 -1
@@ -227,7 +227,7 @@ struct exfat_sb_info {unsigned int root_dir;/* root dir cluster */ unsigned int dentries_per_clu;/* num of dentries per cluster */ unsigned int vol_flag;/* volume dirty flag */ -struct buffer_head *pbr_bh;/* buffer_head of PBR sector */ +struct buffer_head *boot_bh;/* buffer_head of BOOT sector */ unsigned int map_clu;/* allocation bitmap start cluster */ unsigned int map_sectors;/* num of allocation bitmap sectors */
fs/exfat/exfat_raw.h +29 -50
100 lines not on this page · raw message
fs/exfat/super.c +42 -42
201 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v2 2/4 exfat: separate the boot sector analysis
Separate the boot sector analysis to read_boot_sector(). Furthermore, add a strict consistency check, because overlapping areas can cause serious corruption.
---
Changes in v2:
- rebase with patch 'optimize dir-cache' applied
fs/exfat/exfat_raw.h | 1 + fs/exfat/super.c | 96 +++++++++++++++++++++++--------------------- 2 files changed, 52 insertions(+), 45 deletions(-)
fs/exfat/exfat_raw.h +1 -0
@@ -15,6 +15,7 @@#define VOL_CLEAN 0x0000#define VOL_DIRTY 0x0002 +#define ERR_MEDIUM 0x0004#define EXFAT_EOF_CLUSTER 0xFFFFFFFFu#define EXFAT_BAD_CLUSTER 0xFFFFFFF7u
fs/exfat/super.c +51 -45
166 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v2 3/4 exfat: add boot region verification
In reply to Tetsuhiro KohadaAdd Boot-Regions verification specified in exFAT specification. Note that the checksum type is strongly related to the raw structure, so the'u32 'type is used to clarify the number of bits.
---
Changes in v2:
- rebase with patch 'optimize dir-cache' applied
- just print a warning when invalid exboot-signature detected
- print additional information when invalid boot-checksum detected
fs/exfat/exfat_fs.h | 1 + fs/exfat/misc.c | 14 +++++++++++++ fs/exfat/super.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+)
fs/exfat/exfat_fs.h +1 -0
@@ -514,6 +514,7 @@ void exfat_set_entry_time(struct exfat_sb_info *sbi, struct timespec64 *ts, u8 *tz, __le16 *time, __le16 *date, u8 *time_cs);unsigned short exfat_calc_chksum_2byte (void *data,int len,unsigned short chksum,int type); +u32 exfat_calc_chksum32 (void *data,int len,u32 chksum,int type);void exfat_update_bh (struct super_block *sb,struct buffer_head *bh,int sync);void exfat_chain_set (struct exfat_chain *ec,unsigned int dir,unsigned int size,unsigned char flags);
fs/exfat/misc.c +14 -0
@@ -151,6 +151,20 @@ unsigned short exfat_calc_chksum_2byte(void *data, int len,return chksum; } +u32 exfat_calc_chksum32 (void *data,int len,u32 chksum,int type) +{ +int i; +u8 *c = (u8 *)data; + +for (i =0 ; i < len; i++, c++) { +if (unlikely (type ==CS_BOOT_SECTOR && + (i ==106 || i ==107 || i ==112 ))) +continue ; + chksum = ((chksum <<31 ) | (chksum >>1 )) + *c; + } +return chksum; +} +void exfat_update_bh (struct super_block *sb,struct buffer_head *bh,int sync) {set_bit (EXFAT_SB_DIRTY , &EXFAT_SB (sb)->s_state);
fs/exfat/super.c +49 -0
61 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v2 4/4 exfat: standardize checksum calculation
In reply to Tetsuhiro KohadaTo clarify that it is a 16-bit checksum, the parts related to the 16-bit checksum are renamed and change type to u16.
Furthermore, replace checksum calculation in exfat_load_upcase_table() with exfat_calc_checksum32().
---
Changes in v2:
- rebase with patch 'optimize dir-cache' applied
fs/exfat/dir.c | 12 ++++++------ fs/exfat/exfat_fs.h | 5 ++--- fs/exfat/misc.c | 10 ++++------ fs/exfat/nls.c | 19 +++++++------------ 4 files changed, 19 insertions(+), 27 deletions(-)
fs/exfat/dir.c +6 -6
@@ -491,7 +491,7 @@ int exfat_update_dir_chksum(struct inode *inode, struct exfat_chain *p_dir,int ret =0 ;int i, num_entries;sector_t sector; -unsigned short chksum; +u16 chksum;struct exfat_dentry *ep, *fep;struct buffer_head *fbh, *bh;
@@ -500,7 +500,7 @@ int exfat_update_dir_chksum(struct inode *inode, struct exfat_chain *p_dir,return -EIO ; num_entries = fep->dentry.file.num_ext +1 ; - chksum =exfat_calc_chksum_2byte (fep,DENTRY_SIZE ,0 ,CS_DIR_ENTRY ); + chksum =exfat_calc_chksum16 (fep,DENTRY_SIZE ,0 ,CS_DIR_ENTRY );for (i =1 ; i < num_entries; i++) { ep =exfat_get_dentry (sb, p_dir, entry + i, &bh,NULL );
@@ -508,7 +508,7 @@ int exfat_update_dir_chksum(struct inode *inode, struct exfat_chain *p_dir, ret = -EIO ; goto release_fbh; } - chksum =exfat_calc_chksum_2byte (ep,DENTRY_SIZE , chksum, + chksum =exfat_calc_chksum16 (ep,DENTRY_SIZE , chksum,CS_DEFAULT );brelse (bh); }
@@ -593,8 +593,8 @@ void exfat_update_dir_chksum_with_entry_set(struct exfat_entry_set_cache *es)for (i =0 ; i < es->num_entries; i++) { ep =exfat_get_dentry_cached (es, i); - chksum =exfat_calc_chksum_2byte (ep,DENTRY_SIZE , chksum, - chksum_type); + chksum =exfat_calc_chksum16 (ep,DENTRY_SIZE , chksum, + chksum_type); chksum_type =CS_DEFAULT ; } ep =exfat_get_dentry_cached (es,0 );
@@ -1000,7 +1000,7 @@ int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei, }if (entry_type ==TYPE_STREAM ) { -unsigned short name_hash; +u16 name_hash;if (step !=DIRENT_STEP_STRM ) { step =DIRENT_STEP_FILE ;
fs/exfat/exfat_fs.h +2 -3
@@ -137,7 +137,7 @@ struct exfat_dentry_namebuf {struct exfat_uni_name {/* +3 for null and for converting */ unsigned short name[MAX_NAME_LENGTH +3 ]; -unsigned short name_hash; +u16 name_hash;unsigned char name_len; };
@@ -512,8 +512,7 @@ void exfat_get_entry_time(struct exfat_sb_info *sbi, struct timespec64 *ts,void exfat_truncate_atime (struct timespec64 *ts);void exfat_set_entry_time (struct exfat_sb_info *sbi,struct timespec64 *ts,u8 *tz,__le16 *time,__le16 *date,u8 *time_cs); -unsigned short exfat_calc_chksum_2byte (void *data,int len, -unsigned short chksum,int type); +u16 exfat_calc_chksum16 (void *data,int len,u16 chksum,int type);u32 exfat_calc_chksum32 (void *data,int len,u32 chksum,int type);void exfat_update_bh (struct super_block *sb,struct buffer_head *bh,int sync); void exfat_chain_set(struct exfat_chain *ec, unsigned int dir,
fs/exfat/misc.c +4 -6
@@ -136,17 +136,15 @@ void exfat_truncate_atime(struct timespec64 *ts) ts->tv_nsec =0 ; } -unsigned short exfat_calc_chksum_2byte (void *data,int len, -unsigned short chksum,int type) +u16 exfat_calc_chksum16 (void *data,int len,u16 chksum,int type) {int i; -unsigned char *c = (unsigned char *)data; +u8 *c = (u8 *)data;for (i =0 ; i < len; i++, c++) { -if (((i ==2 ) || (i ==3 )) && (type ==CS_DIR_ENTRY )) +if (unlikely (type ==CS_DIR_ENTRY && (i ==2 || i ==3 )))continue ; - chksum = (((chksum &1 ) <<15 ) | ((chksum &0xFFFE ) >>1 )) + - (unsigned short )*c; + chksum = ((chksum <<15 ) | (chksum >>1 )) + *c; }return chksum; }
fs/exfat/nls.c +7 -12
@@ -527,7 +527,7 @@ static int exfat_utf8_to_utf16(struct super_block *sb, *uniname ='\0' ; p_uniname->name_len = unilen; - p_uniname->name_hash =exfat_calc_chksum_2byte (upname, unilen <<1 ,0 , + p_uniname->name_hash =exfat_calc_chksum16 (upname, unilen <<1 ,0 ,CS_DEFAULT );if (p_lossy)
@@ -623,7 +623,7 @@ static int exfat_nls_to_ucs2(struct super_block *sb, *uniname ='\0' ; p_uniname->name_len = unilen; - p_uniname->name_hash =exfat_calc_chksum_2byte (upname, unilen <<1 ,0 , + p_uniname->name_hash =exfat_calc_chksum16 (upname, unilen <<1 ,0 ,CS_DEFAULT );if (p_lossy)
@@ -655,7 +655,8 @@ static int exfat_load_upcase_table(struct super_block *sb, {struct exfat_sb_info *sbi =EXFAT_SB (sb);unsigned int sect_size = sb->s_blocksize; -unsigned int i, index =0 , checksum =0 ; +unsigned int i, index =0 ; +u32 chksum =0 ;int ret;unsigned char skip = false;unsigned short *upcase_table;
@@ -681,13 +682,6 @@ static int exfat_load_upcase_table(struct super_block *sb,for (i =0 ; i < sect_size && index <=0xFFFF ; i +=2 ) {unsigned short uni =get_unaligned_le16 (bh->b_data + i); - checksum = ((checksum &1 ) ?0x80000000 :0 ) + - (checksum >>1 ) + - *(((unsigned char *)bh->b_data) + i); - checksum = ((checksum &1 ) ?0x80000000 :0 ) + - (checksum >>1 ) + - *(((unsigned char *)bh->b_data) + (i +1 )); -if (skip) { index += uni; skip = false;
@@ -701,13 +695,14 @@ static int exfat_load_upcase_table(struct super_block *sb, } }brelse (bh); + chksum =exfat_calc_chksum32 (bh->b_data, i, chksum,CS_DEFAULT ); } -if (index >=0xFFFF && utbl_checksum == checksum) +if (index >=0xFFFF && utbl_checksum == chksum)return 0 ;exfat_err (sb,"failed to load upcase table (idx : 0x%08x, chksum : 0x%08x, utbl_chksum : 0x%08x)" , - index, checksum, utbl_checksum); + index, chksum, utbl_checksum); ret = -EINVAL ; free_table:exfat_free_upcase_table (sbi);
Signature · 1 line
2.25.1