Skip to contentSkip to conversation

ubifs: possible missed le64_to_cpu() in journal

PATCH In review Ben Dooks (Codethink) 2 participants 2 messages Oct 16, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ubifs: possible missed le64_to_cpu() in journal

In the ubifs_jnl_write_inode() functon, it calls ubifs_iget() with xent->inum. The xent->inum is __le64, but the ubifs_iget() takes native cpu endian.

I think that this should be changed to passing le64_to_cpu(xent->inum) to fix the following sparse warning:

fs/ubifs/journal.c:902:58: warning: incorrect type in argument 2 (different base types)
fs/ubifs/journal.c:902:58: expected unsigned long inum
fs/ubifs/journal.c:902:58: got restricted __le64 [usertype] inum

---
Cc: Richard Weinberger <[email protected]>
Cc: Artem Bityutskiy <[email protected]>
Cc: Adrian Hunter <[email protected]>
Cc: [email protected]
Cc: [email protected]

---
 fs/ubifs/journal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ubifs/journal.c +1 -1
index d6136f7c1cfc..388fe8f5dc51 100644
@@ -899,7 +899,7 @@ int ubifs_jnl_write_inode(struct ubifs_info *c, const struct inode *inode)
 			fname_name(&nm) = xent->name;
 			fname_len(&nm) = le16_to_cpu(xent->nlen);
 
-			xino = ubifs_iget(c->vfs_sb, xent->inum);
+			xino = ubifs_iget(c->vfs_sb, le64_to_cpu(xent->inum));
 			if (IS_ERR(xino)) {
 				err = PTR_ERR(xino);
 				ubifs_err(c, "dead directory entry '%s', error %d",
Signature · 1 line
2.23.0
#1 lore raw

----- Ursprüngliche Mail -----

Quoted 36 lines

Von: "Ben Dooks (Codethink)" <[email protected]>
An: [email protected]
CC: "Ben Dooks (Codethink)" <[email protected]>, "richard" <[email protected]>, "Artem Bityutskiy" <[email protected]>, "Adrian Hunter" <[email protected]>, "linux-mtd" <[email protected]>, "linux-kernel" <[email protected]>
Gesendet: Mittwoch, 16. Oktober 2019 12:08:03
Betreff: [PATCH] ubifs: possible missed le64_to_cpu() in journal

In the ubifs_jnl_write_inode() functon, it calls ubifs_iget() with xent->inum. The xent->inum is __le64, but the ubifs_iget() takes native cpu endian.

I think that this should be changed to passing le64_to_cpu(xent->inum) to fix the following sparse warning:

fs/ubifs/journal.c:902:58: warning: incorrect type in argument 2 (different base types)
fs/ubifs/journal.c:902:58: expected unsigned long inum
fs/ubifs/journal.c:902:58: got restricted __le64 [usertype] inum

---
Cc: Richard Weinberger <[email protected]>
Cc: Artem Bityutskiy <[email protected]>
Cc: Adrian Hunter <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
fs/ubifs/journal.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
fs/ubifs/journal.c +0 -0
index d6136f7c1cfc..388fe8f5dc51 100644

fs/ubifs/journal.c int ubifs_jnl_write_inode(struct ubifs_info *c, const struct · line 903

Quoted 6 lines
fs/ubifs/journal.c +1 -1
@@ -899,7 +899,7 @@ int ubifs_jnl_write_inode(struct ubifs_info *c, const struct
 inode *inode)
 			fname_name(&nm) = xent->name;
 			fname_len(&nm) = le16_to_cpu(xent->nlen);
 
-			xino = ubifs_iget(c->vfs_sb, xent->inum);
+			xino = ubifs_iget(c->vfs_sb, le64_to_cpu(xent->inum));

Good catch!

Thanks,
//richard