>From c617f6bceedc2f68c62e7432f12b59124bab34f7 Mon Sep 17 00:00:00 2001 From: KB Date: Wed, 25 May 2016 22:12:05 +0200 Subject: [PATCH 2/7] cpu endian vs file system endian Signed-off-by: KB --- fs/freevxfs/vxfs.h | 25 +++++++++++- fs/freevxfs/vxfs_bmap.c | 24 ++++++----- fs/freevxfs/vxfs_fshead.c | 25 +++++++++++- fs/freevxfs/vxfs_inode.c | 61 +++++++++++++++++++++++++++- fs/freevxfs/vxfs_inode.h | 8 ++-- fs/freevxfs/vxfs_lookup.c | 15 ++++++- fs/freevxfs/vxfs_olt.c | 15 ++++--- fs/freevxfs/vxfs_super.c | 97 ++++++++++++++++++++++++++++++++------------- 8 files changed, 215 insertions(+), 55 deletions(-) diff --git a/fs/freevxfs/vxfs.h b/fs/freevxfs/vxfs.h index c8a9265..5dc8949 100644 --- a/fs/freevxfs/vxfs.h +++ b/fs/freevxfs/vxfs.h @@ -152,7 +152,7 @@ struct vxfs_sb { /* * Actually much more... */ -}; +} __packed; /* @@ -168,9 +168,32 @@ struct vxfs_sb_info { ino_t vsi_fshino; /* fileset header inode */ daddr_t vsi_oltext; /* OLT extent */ daddr_t vsi_oltsize; /* OLT size */ + int byte_order; + int silent; +}; + +enum { + BO_LE = 1, + BO_BE }; +static inline u32 fs32_to_cpu(int bo, u32 a) +{ + return (bo == BO_BE) ? be32_to_cpu(a) : le32_to_cpu(a); +} + +static inline u16 fs16_to_cpu(int bo, u16 a) +{ + return (bo == BO_BE) ? be16_to_cpu(a) : le16_to_cpu(a); +} + +static inline u64 fs64_to_cpu(int bo, u64 a) +{ + return (bo == BO_BE) ? be64_to_cpu(a) : le64_to_cpu(a); +} + + /* * File modes. File types above 0xf000 are vxfs internal only, they should * not be passed back to higher levels of the system. vxfs file types must diff --git a/fs/freevxfs/vxfs_bmap.c b/fs/freevxfs/vxfs_bmap.c index f86fd3c..95afd98 100644 --- a/fs/freevxfs/vxfs_bmap.c +++ b/fs/freevxfs/vxfs_bmap.c @@ -92,7 +92,8 @@ vxfs_bmap_ext4(struct inode *ip, long bn) goto fail_buf; indir = (u32 *)buf->b_data; - bno = indir[(bn/indsize) % (indsize*bn)] + (bn%indsize); + bno = fs32_to_cpu(VXFS_SBI(sb)->byte_order, + indir[(bn/indsize) % (indsize*bn)]) + (bn % indsize); brelse(buf); return bno; @@ -130,6 +131,7 @@ vxfs_bmap_indir(struct inode *ip, long indir, int size, long block) struct buffer_head *bp = NULL; daddr_t pblock = 0; int i; + int bo = VXFS_SBI(ip->i_sb)->byte_order; for (i = 0; i < size * VXFS_TYPED_PER_BLOCK(ip->i_sb); i++) { struct vxfs_typed *typ; @@ -142,24 +144,24 @@ vxfs_bmap_indir(struct inode *ip, long indir, int size, long block) typ = ((struct vxfs_typed *)bp->b_data) + (i % VXFS_TYPED_PER_BLOCK(ip->i_sb)); - off = (typ->vt_hdr & VXFS_TYPED_OFFSETMASK); + off = fs64_to_cpu(bo, typ->vt_hdr) & VXFS_TYPED_OFFSETMASK; if (block < off) { brelse(bp); continue; } - switch ((u_int32_t)(typ->vt_hdr >> VXFS_TYPED_TYPESHIFT)) { + switch ((u_int32_t)(fs64_to_cpu(bo, typ->vt_hdr) >> VXFS_TYPED_TYPESHIFT)) { case VXFS_TYPED_INDIRECT: - pblock = vxfs_bmap_indir(ip, typ->vt_block, - typ->vt_size, block - off); + pblock = vxfs_bmap_indir(ip, fs32_to_cpu(bo, typ->vt_block), + fs32_to_cpu(bo, typ->vt_size), block - off); if (pblock == -2) break; goto out; case VXFS_TYPED_DATA: - if ((block - off) >= typ->vt_size) + if ((block - off) >= fs32_to_cpu(bo, typ->vt_size)) break; - pblock = (typ->vt_block + block - off); + pblock = fs32_to_cpu(bo, typ->vt_block) + block - off; goto out; case VXFS_TYPED_INDIRECT_DEV4: case VXFS_TYPED_DATA_DEV4: { @@ -168,12 +170,14 @@ vxfs_bmap_indir(struct inode *ip, long indir, int size, long block) printk(KERN_INFO "\n\nTYPED_DEV4 detected!\n"); printk(KERN_INFO "block: %Lu\tsize: %Ld\tdev: %d\n", - (unsigned long long) typ4->vd4_block, - (unsigned long long) typ4->vd4_size, - typ4->vd4_dev); + (unsigned long long) fs64_to_cpu(bo, typ4->vd4_block), + (unsigned long long) fs64_to_cpu(bo, typ4->vd4_size), + fs32_to_cpu(bo, typ4->vd4_dev)); goto fail; } default: + printk(KERN_ERR "%s:%d vt_hdr %llu\n", __func__, __LINE__, + fs64_to_cpu(bo, typ->vt_hdr)); BUG(); } brelse(bp); diff --git a/fs/freevxfs/vxfs_fshead.c b/fs/freevxfs/vxfs_fshead.c index c9a6a94..6cbdde7 100644 --- a/fs/freevxfs/vxfs_fshead.c +++ b/fs/freevxfs/vxfs_fshead.c @@ -60,6 +60,29 @@ vxfs_dumpfsh(struct vxfs_fsh *fhp) } #endif +#define VXFS_FS32(field1, field2) fhp->field1 = fs32_to_cpu(bo, dbh->field2) +static inline void dbh2fhp(struct vxfs_fsh *fhp, void *_dbh, int bo) +{ + struct vxfs_fsh *dbh = (struct vxfs_fsh *)_dbh; + + VXFS_FS32(fsh_version, fsh_version); + VXFS_FS32(fsh_fsindex, fsh_fsindex); + VXFS_FS32(fsh_time, fsh_time); + VXFS_FS32(fsh_utime, fsh_utime); + VXFS_FS32(fsh_extop, fsh_extop); + VXFS_FS32(fsh_ninodes, fsh_ninodes); + VXFS_FS32(fsh_nau, fsh_nau); + VXFS_FS32(fsh_old_ilesize, fsh_old_ilesize); + VXFS_FS32(fsh_dflags, fsh_dflags); + VXFS_FS32(fsh_quota, fsh_quota); + VXFS_FS32(fsh_maxinode, fsh_maxinode); + VXFS_FS32(fsh_iauino, fsh_iauino); + VXFS_FS32(fsh_ilistino[0], fsh_ilistino[0]); + VXFS_FS32(fsh_ilistino[1], fsh_ilistino[1]); + VXFS_FS32(fsh_lctino, fsh_lctino); +} + + /** * vxfs_getfsh - read fileset header into memory * @ip: the (fake) fileset header inode @@ -83,7 +106,7 @@ vxfs_getfsh(struct inode *ip, int which) if (!(fhp = kmalloc(sizeof(*fhp), GFP_KERNEL))) goto out; - memcpy(fhp, bp->b_data, sizeof(*fhp)); + dbh2fhp(fhp, bp->b_data, VXFS_SBI(ip->i_sb)->byte_order); put_bh(bp); return (fhp); diff --git a/fs/freevxfs/vxfs_inode.c b/fs/freevxfs/vxfs_inode.c index 363e3ae..53b8757 100644 --- a/fs/freevxfs/vxfs_inode.c +++ b/fs/freevxfs/vxfs_inode.c @@ -67,6 +67,63 @@ vxfs_dumpi(struct vxfs_inode_info *vip, ino_t ino) } #endif +#define VXFS_FS32(field1, field2) vip->field1 = fs32_to_cpu(bo, dip->field2) +#define VXFS_FS64(field1, field2) vip->field1 = fs64_to_cpu(bo, dip->field2) +#define VXFS_FS16(field1, field2) vip->field1 = fs16_to_cpu(bo, dip->field2) + +static inline void dip2vip_cpy(struct vxfs_inode_info *vip, struct vxfs_dinode *dip, int bo) +{ + int j; + + VXFS_FS32(vdi_mode, vdi_mode); + VXFS_FS32(vdi_nlink, vdi_nlink); + VXFS_FS32(vdi_uid, vdi_uid); + VXFS_FS32(vdi_gid, vdi_gid); + VXFS_FS64(vdi_size, vdi_size); + VXFS_FS32(vdi_atime, vdi_atime); + VXFS_FS32(vdi_autime, vdi_autime); + VXFS_FS32(vdi_mtime, vdi_mtime); + VXFS_FS32(vdi_mutime, vdi_mutime); + VXFS_FS32(vdi_ctime, vdi_ctime); + VXFS_FS32(vdi_cutime, vdi_cutime); + vip->vdi_aflags = dip->vdi_aflags; + vip->vdi_orgtype = dip->vdi_orgtype; + VXFS_FS16(vdi_eopflags, vdi_eopflags); + VXFS_FS32(vdi_eopdata, vdi_eopdata); + + VXFS_FS32(vdi_ftarea.i_regular.reserved, vdi_ftarea.i_regular.reserved); + VXFS_FS32(vdi_ftarea.i_regular.fixextsize, vdi_ftarea.i_regular.fixextsize); + VXFS_FS32(vdi_blocks, vdi_blocks); + VXFS_FS32(vdi_gen, vdi_gen); + VXFS_FS64(vdi_version, vdi_version); + + switch (dip->vdi_orgtype) { + case VXFS_ORG_EXT4: + VXFS_FS32(vdi_org.ext4.ve4_spare, vdi_org.ext4.ve4_spare); + VXFS_FS32(vdi_org.ext4.ve4_indsize, vdi_org.ext4.ve4_indsize); + for (j = 0; j < VXFS_NIADDR; j++) { + VXFS_FS32(vdi_org.ext4.ve4_indir[j], vdi_org.ext4.ve4_indir[j]); + } + for (j = 0; j < VXFS_NDADDR; j++) { + VXFS_FS32(vdi_org.ext4.ve4_direct[j].extent, vdi_org.ext4.ve4_direct[j].extent); + VXFS_FS32(vdi_org.ext4.ve4_direct[j].size, vdi_org.ext4.ve4_direct[j].size); + } + break; + case VXFS_ORG_IMMED: + memcpy(&vip->vdi_org.immed, &dip->vdi_org.immed, sizeof(vip->vdi_org.immed)); + break; + case VXFS_ORG_TYPED: + for (j = 0; j < VXFS_NTYPED; j++) { + VXFS_FS64(vdi_org.typed[j].vt_hdr, vdi_org.typed[j].vt_hdr); + VXFS_FS32(vdi_org.typed[j].vt_block, vdi_org.typed[j].vt_block); + VXFS_FS32(vdi_org.typed[j].vt_size, vdi_org.typed[j].vt_size); + } + break; + }; + + VXFS_FS32(vdi_iattrino, vdi_iattrino); +} + /** * vxfs_blkiget - find inode based on extent # @@ -101,7 +158,7 @@ vxfs_blkiget(struct super_block *sbp, u_long extent, ino_t ino) if (!(vip = kmem_cache_alloc(vxfs_inode_cachep, GFP_KERNEL))) goto fail; dip = (struct vxfs_dinode *)(bp->b_data + offset); - memcpy(vip, dip, sizeof(*vip)); + dip2vip_cpy(vip, dip, VXFS_SBI(sbp)->byte_order); #ifdef DIAGNOSTIC vxfs_dumpi(vip, ino); #endif @@ -143,7 +200,7 @@ __vxfs_iget(ino_t ino, struct inode *ilistp) if (!(vip = kmem_cache_alloc(vxfs_inode_cachep, GFP_KERNEL))) goto fail; dip = (struct vxfs_dinode *)(kaddr + offset); - memcpy(vip, dip, sizeof(*vip)); + dip2vip_cpy(vip, dip, VXFS_SBI(ilistp->i_sb)->byte_order); #ifdef DIAGNOSTIC vxfs_dumpi(vip, ino); #endif diff --git a/fs/freevxfs/vxfs_inode.h b/fs/freevxfs/vxfs_inode.h index 240aeb1..9a2c376 100644 --- a/fs/freevxfs/vxfs_inode.h +++ b/fs/freevxfs/vxfs_inode.h @@ -77,13 +77,13 @@ struct vxfs_ext4 { vx_daddr_t extent; /* Extent number */ int32_t size; /* Size of extent */ } ve4_direct[VXFS_NDADDR]; -}; +} __packed; struct vxfs_typed { u_int64_t vt_hdr; /* Header, 0xTTOOOOOOOOOOOOOO; T=type,O=offs */ vx_daddr_t vt_block; /* Extent block */ int32_t vt_size; /* Size in blocks */ -}; +} __packed; struct vxfs_typed_dev4 { u_int64_t vd4_hdr; /* Header, 0xTTOOOOOOOOOOOOOO; T=type,O=offs */ @@ -91,7 +91,7 @@ struct vxfs_typed_dev4 { u_int64_t vd4_size; /* Size in blocks */ int32_t vd4_dev; /* Device ID */ u_int32_t __pad1; -}; +} __packed; /* * The inode as contained on the physical device. @@ -134,7 +134,7 @@ struct vxfs_dinode { struct vxfs_typed typed[VXFS_NTYPED]; } vdi_org; u_int32_t vdi_iattrino; -}; +} __packed; #define vdi_rdev vdi_ftarea.rdev #define vdi_dotdot vdi_ftarea.dotdot diff --git a/fs/freevxfs/vxfs_lookup.c b/fs/freevxfs/vxfs_lookup.c index 99c7f0a..cea158a 100644 --- a/fs/freevxfs/vxfs_lookup.c +++ b/fs/freevxfs/vxfs_lookup.c @@ -96,6 +96,15 @@ vxfs_next_entry(struct vxfs_direct *de) return ((struct vxfs_direct *)((char*)de + de->d_reclen)); } +/* + * VXFS_dirblk_ovh is the overhead of a specific dirblock. + */ +static inline u_long VXFS_dirblk_ovh(struct vxfs_dirblk *dbp, int bo) +{ + return (sizeof(short) * fs16_to_cpu(bo, dbp->d_nhash)) + 4; +} + + /** * vxfs_find_entry - find a mathing directory entry for a dentry * @ip: directory inode @@ -242,6 +251,8 @@ vxfs_readdir(struct file *fp, struct dir_context *ctx) u_long bsize = sbp->s_blocksize; u_long page, npages, block, pblocks, nblocks, offset; loff_t pos; + int bo = VXFS_SBI(sbp)->byte_order; + if (ctx->pos == 0) { if (!dir_emit_dot(fp, ctx)) @@ -297,8 +308,8 @@ vxfs_readdir(struct file *fp, struct dir_context *ctx) offset = (char *)de - kaddr; ctx->pos = ((page << PAGE_CACHE_SHIFT) | offset) + 2; - if (!dir_emit(ctx, de->d_name, de->d_namelen, - de->d_ino, DT_UNKNOWN)) { + if (!dir_emit(ctx, de->d_name, fs16_to_cpu(bo, de->d_namelen), + fs32_to_cpu(bo, de->d_ino), DT_UNKNOWN)) { vxfs_put_page(pp); return 0; } diff --git a/fs/freevxfs/vxfs_olt.c b/fs/freevxfs/vxfs_olt.c index 0495008..6b50188 100644 --- a/fs/freevxfs/vxfs_olt.c +++ b/fs/freevxfs/vxfs_olt.c @@ -43,14 +43,14 @@ static inline void vxfs_get_fshead(struct vxfs_oltfshead *fshp, struct vxfs_sb_info *infp) { BUG_ON(infp->vsi_fshino); - infp->vsi_fshino = fshp->olt_fsino[0]; + infp->vsi_fshino = fs32_to_cpu(infp->byte_order, fshp->olt_fsino[0]); } static inline void vxfs_get_ilist(struct vxfs_oltilist *ilistp, struct vxfs_sb_info *infp) { BUG_ON(infp->vsi_iext); - infp->vsi_iext = ilistp->olt_iext[0]; + infp->vsi_iext = fs32_to_cpu(infp->byte_order, ilistp->olt_iext[0]); } static inline u_long @@ -80,6 +80,7 @@ vxfs_read_olt(struct super_block *sbp, u_long bsize) struct buffer_head *bp; struct vxfs_olt *op; char *oaddr, *eaddr; + int bo = infp->byte_order; bp = sb_bread(sbp, vxfs_oblock(sbp, infp->vsi_oltext, bsize)); @@ -87,7 +88,7 @@ vxfs_read_olt(struct super_block *sbp, u_long bsize) goto fail; op = (struct vxfs_olt *)bp->b_data; - if (op->olt_magic != VXFS_OLT_MAGIC) { + if (fs32_to_cpu(bo, op->olt_magic) != VXFS_OLT_MAGIC) { printk(KERN_NOTICE "vxfs: ivalid olt magic number\n"); goto fail; } @@ -102,14 +103,14 @@ vxfs_read_olt(struct super_block *sbp, u_long bsize) goto fail; } - oaddr = bp->b_data + op->olt_size; + oaddr = bp->b_data + fs32_to_cpu(bo, op->olt_size); eaddr = bp->b_data + (infp->vsi_oltsize * sbp->s_blocksize); while (oaddr < eaddr) { struct vxfs_oltcommon *ocp = (struct vxfs_oltcommon *)oaddr; - switch (ocp->olt_type) { + switch (fs32_to_cpu(bo, ocp->olt_type)) { case VXFS_OLT_FSHEAD: vxfs_get_fshead((struct vxfs_oltfshead *)oaddr, infp); break; @@ -118,11 +119,11 @@ vxfs_read_olt(struct super_block *sbp, u_long bsize) break; } - oaddr += ocp->olt_size; + oaddr += fs32_to_cpu(bo, ocp->olt_size); } brelse(bp); - return 0; + return (infp->vsi_fshino && infp->vsi_iext) ? 0 : -EINVAL; fail: brelse(bp); diff --git a/fs/freevxfs/vxfs_super.c b/fs/freevxfs/vxfs_super.c index 7ca8c75..6a19802 100644 --- a/fs/freevxfs/vxfs_super.c +++ b/fs/freevxfs/vxfs_super.c @@ -109,14 +109,15 @@ static int vxfs_statfs(struct dentry *dentry, struct kstatfs *bufp) { struct vxfs_sb_info *infp = VXFS_SBI(dentry->d_sb); + struct vxfs_sb *raw_sb = infp->vsi_raw; bufp->f_type = VXFS_SUPER_MAGIC; bufp->f_bsize = dentry->d_sb->s_blocksize; - bufp->f_blocks = infp->vsi_raw->vs_dsize; - bufp->f_bfree = infp->vsi_raw->vs_free; + bufp->f_blocks = fs32_to_cpu(infp->byte_order, raw_sb->vs_dsize); + bufp->f_bfree = fs32_to_cpu(infp->byte_order, raw_sb->vs_free); bufp->f_bavail = 0; bufp->f_files = 0; - bufp->f_ffree = infp->vsi_raw->vs_ifree; + bufp->f_ffree = fs32_to_cpu(infp->byte_order, raw_sb->vs_ifree); bufp->f_namelen = VXFS_NAMELEN; return 0; @@ -129,6 +130,46 @@ static int vxfs_remount(struct super_block *sb, int *flags, char *data) return 0; } + +static int vxfs_try_sb_magic(struct super_block *sbp, int blk, u32 magic) +{ + struct buffer_head *bp; + struct vxfs_sb *rsbp; + struct vxfs_sb_info *infp = VXFS_SBI(sbp); + int rc = -ENOMEM; + + bp = sb_bread(sbp, blk); + do { + if (!bp || !buffer_mapped(bp)) { + if (!infp->silent) { + printk(KERN_WARNING "vxfs: unable to read" + " disk superblock at %d\n", blk); + } + break; + } + + rc = -EINVAL; + rsbp = (struct vxfs_sb *)bp->b_data; + if (rsbp->vs_magic != magic) { + if (!infp->silent) + printk(KERN_NOTICE "vxfs: WRONG superblock magic\n"); + break; + } + + rc = 0; + infp->vsi_raw = rsbp; + infp->vsi_bp = bp; + } while (0); + + if (rc) { + infp->vsi_raw = NULL; + infp->vsi_bp = NULL; + brelse(bp); + } + + return rc; +} + /** * vxfs_read_super - read superblock into memory and initialize filesystem * @sbp: VFS superblock (to fill) @@ -149,10 +190,10 @@ static int vxfs_fill_super(struct super_block *sbp, void *dp, int silent) { struct vxfs_sb_info *infp; struct vxfs_sb *rsbp; - struct buffer_head *bp = NULL; u_long bsize; struct inode *root; int ret = -EINVAL; + u32 j; sbp->s_flags |= MS_RDONLY; @@ -162,48 +203,47 @@ static int vxfs_fill_super(struct super_block *sbp, void *dp, int silent) return -ENOMEM; } + infp->silent = silent; bsize = sb_min_blocksize(sbp, BLOCK_SIZE); if (!bsize) { printk(KERN_WARNING "vxfs: unable to set blocksize\n"); goto out; } - bp = sb_bread(sbp, 1); - if (!bp || !buffer_mapped(bp)) { - if (!silent) { - printk(KERN_WARNING - "vxfs: unable to read disk superblock\n"); + sbp->s_fs_info = infp; + do { + if (!vxfs_try_sb_magic(sbp, 1, cpu_to_le32(VXFS_SUPER_MAGIC))) { + infp->byte_order = BO_LE; /* SCO */ + break; + } + + if (!vxfs_try_sb_magic(sbp, 8, cpu_to_be32(VXFS_SUPER_MAGIC))) { + infp->byte_order = BO_BE; /* HP-UX pa-risc likely */ + break; } - goto out; - } - rsbp = (struct vxfs_sb *)bp->b_data; - if (rsbp->vs_magic != VXFS_SUPER_MAGIC) { - if (!silent) - printk(KERN_NOTICE "vxfs: WRONG superblock magic\n"); goto out; - } + } while (0); - if ((rsbp->vs_version < 2 || rsbp->vs_version > 4) && !silent) { - printk(KERN_NOTICE "vxfs: unsupported VxFS version (%d)\n", - rsbp->vs_version); + rsbp = infp->vsi_raw; + j = fs32_to_cpu(infp->byte_order, rsbp->vs_version); + if ((j < 2 || j > 4) && !silent) { + printk(KERN_NOTICE "vxfs: unsupported VxFS version (%d)\n", j); goto out; } #ifdef DIAGNOSTIC - printk(KERN_DEBUG "vxfs: supported VxFS version (%d)\n", rsbp->vs_version); + printk(KERN_DEBUG "vxfs: supported VxFS version (%d)\n", j); printk(KERN_DEBUG "vxfs: blocksize: %d\n", rsbp->vs_bsize); #endif - sbp->s_magic = rsbp->vs_magic; - sbp->s_fs_info = infp; + sbp->s_magic = fs32_to_cpu(infp->byte_order, rsbp->vs_magic); - infp->vsi_raw = rsbp; - infp->vsi_bp = bp; - infp->vsi_oltext = rsbp->vs_oltext[0]; - infp->vsi_oltsize = rsbp->vs_oltsize; + infp->vsi_oltext = fs32_to_cpu(infp->byte_order, rsbp->vs_oltext[0]); + infp->vsi_oltsize = fs32_to_cpu(infp->byte_order, rsbp->vs_oltsize); - if (!sb_set_blocksize(sbp, rsbp->vs_bsize)) { + j = fs32_to_cpu(infp->byte_order, rsbp->vs_bsize); + if (!sb_set_blocksize(sbp, j)) { printk(KERN_WARNING "vxfs: unable to set final block size\n"); goto out; } @@ -237,7 +277,8 @@ out_free_ilist: vxfs_put_fake_inode(infp->vsi_ilist); vxfs_put_fake_inode(infp->vsi_stilist); out: - brelse(bp); + if (infp->vsi_bp) + brelse(infp->vsi_bp); kfree(infp); return ret; } -- 1.7.3.4