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

fs/btrfs: Squash some uninitialized reads

Browse Source 
We need to check errors before calling into a function that uses the result.

Signed-off-by: Daniel Axtens <dja@axtens.net>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Daniel Axtens authored and Daniel Kiper committed 2021-03-02 15:54:19 +01:00
1 parent b88a82e78c
commit b911884dd7
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
grub-core/fs/btrfs.c
+2 -2
View File
@@ -383,9 +383,9 @@ next (struct grub_btrfs_data *data,
err = grub_btrfs_read_logical (data, grub_le_to_cpu64 (node.addr), err = grub_btrfs_read_logical (data, grub_le_to_cpu64 (node.addr),
&head, sizeof (head), 0); &head, sizeof (head), 0);
check_btrfs_header (data, &head, grub_le_to_cpu64 (node.addr));
if (err) if (err)
return -err; return -err;
check_btrfs_header (data, &head, grub_le_to_cpu64 (node.addr));
save_ref (desc, grub_le_to_cpu64 (node.addr), 0, save_ref (desc, grub_le_to_cpu64 (node.addr), 0,
grub_le_to_cpu32 (head.nitems), !head.level); grub_le_to_cpu32 (head.nitems), !head.level);
@@ -445,9 +445,9 @@ lower_bound (struct grub_btrfs_data *data,
/* FIXME: preread few nodes into buffer. */ /* FIXME: preread few nodes into buffer. */
err = grub_btrfs_read_logical (data, addr, &head, sizeof (head), err = grub_btrfs_read_logical (data, addr, &head, sizeof (head),
recursion_depth + 1); recursion_depth + 1);
check_btrfs_header (data, &head, addr);
if (err) if (err)
return err; return err;
check_btrfs_header (data, &head, addr);
addr += sizeof (head); addr += sizeof (head);
if (head.level) if (head.level)
{ {