Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-27 17:49:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fs/jfs: Inconsistent signed/unsigned types usage in return values

Browse Source 
The getblk() returns a value of type grub_int64_t which is assigned to
iagblk and inoblk, both of type grub_uint64_t, in grub_jfs_read_inode()
via grub_jfs_blkno(). This patch fixes the type mismatch in the
functions. Additionally, the getblk() will return 0 instead of -1 on
failure cases. This change is safe because grub_errno is always set in
getblk() to indicate errors and it is later checked in the callers.

Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
Reviewed-by: Alec Brown <alec.r.brown@oracle.com>
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Lidong Chen authored and Daniel Kiper committed 2025-01-23 16:22:46 +01:00
1 parent bd999310fe
commit edd995a26e
1 file changed
+9 -6
Download Patch File Download Diff File Expand all files Collapse all files
grub-core/fs/jfs.c
+9 -6
View File
@@ -279,7 +279,7 @@ get_ext_offset (grub_uint8_t offset1, grub_uint32_t offset2)
return (((grub_uint64_t) offset1 << 32) | grub_le_to_cpu32 (offset2)); return (((grub_uint64_t) offset1 << 32) | grub_le_to_cpu32 (offset2));
} }
static grub_int64_t static grub_uint64_t
getblk (struct grub_jfs_treehead *treehead, getblk (struct grub_jfs_treehead *treehead,
struct grub_jfs_tree_extent *extents, struct grub_jfs_tree_extent *extents,
int max_extents, int max_extents,
@@ -290,6 +290,8 @@ getblk (struct grub_jfs_treehead *treehead,
int i; int i;
grub_uint64_t ext_offset, ext_blk; grub_uint64_t ext_offset, ext_blk;
grub_errno = GRUB_ERR_NONE;
for (i = 0; i < grub_le_to_cpu16 (treehead->count) - 2 && for (i = 0; i < grub_le_to_cpu16 (treehead->count) - 2 &&
i < max_extents; i++) i < max_extents; i++)
{ {
@@ -312,7 +314,7 @@ getblk (struct grub_jfs_treehead *treehead,
if (found != -1) if (found != -1)
{ {
grub_int64_t ret = -1; grub_uint64_t ret = 0;
struct struct
{ {
struct grub_jfs_treehead treehead; struct grub_jfs_treehead treehead;
@@ -321,7 +323,7 @@ getblk (struct grub_jfs_treehead *treehead,
tree = grub_zalloc (sizeof (*tree)); tree = grub_zalloc (sizeof (*tree));
if (!tree) if (!tree)
return -1; return 0;
if (!grub_disk_read (data->disk, if (!grub_disk_read (data->disk,
(grub_disk_addr_t) ext_blk (grub_disk_addr_t) ext_blk
@@ -334,19 +336,20 @@ getblk (struct grub_jfs_treehead *treehead,
else else
{ {
grub_error (GRUB_ERR_BAD_FS, "jfs: infinite recursion detected"); grub_error (GRUB_ERR_BAD_FS, "jfs: infinite recursion detected");
ret = -1; ret = 0;
} }
} }
grub_free (tree); grub_free (tree);
return ret; return ret;
} }
return -1; grub_error (GRUB_ERR_READ_ERROR, "jfs: block %" PRIuGRUB_UINT64_T " not found", blk);
return 0;
} }
/* Get the block number for the block BLK in the node INODE in the /* Get the block number for the block BLK in the node INODE in the
mounted filesystem DATA. */ mounted filesystem DATA. */
static grub_int64_t static grub_uint64_t
grub_jfs_blkno (struct grub_jfs_data *data, struct grub_jfs_inode *inode, grub_jfs_blkno (struct grub_jfs_data *data, struct grub_jfs_inode *inode,
grub_uint64_t blk) grub_uint64_t blk)
{ {