Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ecb9529 authored by Harvey Harrison's avatar Harvey Harrison Committed by Artem Bityutskiy
Browse files

UBIFS: endian handling fixes and annotations 



Noticed by sparse:
fs/ubifs/file.c:75:2: warning: restricted __le64 degrades to integer
fs/ubifs/file.c:629:4: warning: restricted __le64 degrades to integer
fs/ubifs/dir.c:431:3: warning: restricted __le64 degrades to integer

This should be checked to ensure the ubifs_assert is working as
intended, I've done the suggested annotation in this patch.

fs/ubifs/sb.c:298:6: warning: incorrect type in assignment (different base types)
fs/ubifs/sb.c:298:6:    expected int [signed] [assigned] tmp
fs/ubifs/sb.c:298:6:    got restricted __le64 [usertype] <noident>
fs/ubifs/sb.c:299:19: warning: incorrect type in assignment (different base types)
fs/ubifs/sb.c:299:19:    expected restricted __le64 [usertype] atime_sec
fs/ubifs/sb.c:299:19:    got int [signed] [assigned] tmp
fs/ubifs/sb.c:300:19: warning: incorrect type in assignment (different base types)
fs/ubifs/sb.c:300:19:    expected restricted __le64 [usertype] ctime_sec
fs/ubifs/sb.c:300:19:    got int [signed] [assigned] tmp
fs/ubifs/sb.c:301:19: warning: incorrect type in assignment (different base types)
fs/ubifs/sb.c:301:19:    expected restricted __le64 [usertype] mtime_sec
fs/ubifs/sb.c:301:19:    got int [signed] [assigned] tmp

This looks like a bugfix as your tmp was a u32 so there was truncation in
the atime, mtime, ctime value, probably not intentional, add a tmp_le64
and use it here.

fs/ubifs/key.h:348:9: warning: cast to restricted __le32
fs/ubifs/key.h:348:9: warning: cast to restricted __le32
fs/ubifs/key.h:419:9: warning: cast to restricted __le32

Read from the annotated union member instead.

fs/ubifs/recovery.c:175:13: warning: incorrect type in assignment (different base types)
fs/ubifs/recovery.c:175:13:    expected unsigned int [unsigned] [usertype] save_flags
fs/ubifs/recovery.c:175:13:    got restricted __le32 [usertype] flags
fs/ubifs/recovery.c:186:13: warning: incorrect type in assignment (different base types)
fs/ubifs/recovery.c:186:13:    expected restricted __le32 [usertype] flags
fs/ubifs/recovery.c:186:13:    got unsigned int [unsigned] [usertype] save_flags

Do byteshifting at compile time of the flag value.  Annotate the saved_flags
as le32.

fs/ubifs/debug.c:368:10: warning: cast to restricted __le32
fs/ubifs/debug.c:368:10: warning: cast from restricted __le64

Should be checked if the truncation was intentional, I've changed the
printk to print the full width.

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 069782a1

fs/ubifs/debug.c

+2 −2
Original line number Diff line number Diff line
@@ -364,8 +364,8 @@ void dbg_dump_node(const struct ubifs_info *c, const void *node) 
		       le32_to_cpu(mst->ihead_lnum));

		printk(KERN_DEBUG "\tihead_offs     %u\n",

		       le32_to_cpu(mst->ihead_offs));

		printk(KERN_DEBUG "\tindex_size     %u\n",

		       le32_to_cpu(mst->index_size));

		printk(KERN_DEBUG "\tindex_size     %llu\n",

		       (unsigned long long)le64_to_cpu(mst->index_size));

		printk(KERN_DEBUG "\tlpt_lnum       %u\n",

		       le32_to_cpu(mst->lpt_lnum));

		printk(KERN_DEBUG "\tlpt_offs       %u\n",

fs/ubifs/dir.c

+2 −1
Original line number Diff line number Diff line
@@ -428,7 +428,8 @@ static int ubifs_readdir(struct file *file, void *dirent, filldir_t filldir) 
		dbg_gen("feed '%s', ino %llu, new f_pos %#x",

			dent->name, (unsigned long long)le64_to_cpu(dent->inum),

			key_hash_flash(c, &dent->key));

		ubifs_assert(dent->ch.sqnum > ubifs_inode(dir)->creat_sqnum);

		ubifs_assert(le64_to_cpu(dent->ch.sqnum) >

			     ubifs_inode(dir)->creat_sqnum);



		nm.len = le16_to_cpu(dent->nlen);

		over = filldir(dirent, dent->name, nm.len, file->f_pos,

fs/ubifs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static int read_block(struct inode *inode, void *addr, unsigned int block, 
		return err;

	}



	ubifs_assert(dn->ch.sqnum > ubifs_inode(inode)->creat_sqnum);

	ubifs_assert(le64_to_cpu(dn->ch.sqnum) > ubifs_inode(inode)->creat_sqnum);



	len = le32_to_cpu(dn->size);

	if (len <= 0 || len > UBIFS_BLOCK_SIZE)
@@ -626,7 +626,7 @@ static int populate_page(struct ubifs_info *c, struct page *page, 


			dn = bu->buf + (bu->zbranch[nn].offs - offs);



			ubifs_assert(dn->ch.sqnum >

			ubifs_assert(le64_to_cpu(dn->ch.sqnum) >

				     ubifs_inode(inode)->creat_sqnum);



			len = le32_to_cpu(dn->size);

fs/ubifs/key.h

+2 −2
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ static inline int key_type_flash(const struct ubifs_info *c, const void *k) 
{

	const union ubifs_key *key = k;



	return le32_to_cpu(key->u32[1]) >> UBIFS_S_KEY_BLOCK_BITS;

	return le32_to_cpu(key->j32[1]) >> UBIFS_S_KEY_BLOCK_BITS;

}



/**
@@ -416,7 +416,7 @@ static inline unsigned int key_block_flash(const struct ubifs_info *c, 
{

	const union ubifs_key *key = k;



	return le32_to_cpu(key->u32[1]) & UBIFS_S_KEY_BLOCK_MASK;

	return le32_to_cpu(key->j32[1]) & UBIFS_S_KEY_BLOCK_MASK;

}



/**

fs/ubifs/recovery.c

+2 −2
Original line number Diff line number Diff line
@@ -168,12 +168,12 @@ static int write_rcvrd_mst_node(struct ubifs_info *c, 
				struct ubifs_mst_node *mst)

{

	int err = 0, lnum = UBIFS_MST_LNUM, sz = c->mst_node_alsz;

	uint32_t save_flags;

	__le32 save_flags;



	dbg_rcvry("recovery");



	save_flags = mst->flags;

	mst->flags = cpu_to_le32(le32_to_cpu(mst->flags) | UBIFS_MST_RCVRY);

	mst->flags |= cpu_to_le32(UBIFS_MST_RCVRY);



	ubifs_prepare_node(c, mst, UBIFS_MST_NODE_SZ, 1);

	err = ubi_leb_change(c->ubi, lnum, mst, sz, UBI_SHORTTERM);