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

fs/nilfs2: Properly bail on errors in grub_nilfs2_btree_node_lookup()

Browse Source 
We just introduced an error return in grub_nilfs2_btree_node_lookup().
Make sure the callers catch it.

At the same time, make sure that grub_nilfs2_btree_node_lookup() always
inits the index pointer passed to it.

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:18 +01:00
1 parent 37c0eb05cd
commit ca5d9ac206
1 file changed
+8 -3
Download Patch File Download Diff File Expand all files Collapse all files
grub-core/fs/nilfs2.c
+8 -3
View File
@@ -433,7 +433,7 @@ grub_nilfs2_btree_node_lookup (struct grub_nilfs2_data *data,
grub_uint64_t key, int *indexp) grub_uint64_t key, int *indexp)
{ {
grub_uint64_t nkey; grub_uint64_t nkey;
int index, low, high, s; int index = 0, low, high, s;
low = 0; low = 0;
@@ -441,10 +441,10 @@ grub_nilfs2_btree_node_lookup (struct grub_nilfs2_data *data,
if (high >= grub_nilfs2_btree_node_nchildren_max (data, node)) if (high >= grub_nilfs2_btree_node_nchildren_max (data, node))
{ {
grub_error (GRUB_ERR_BAD_FS, "too many children"); grub_error (GRUB_ERR_BAD_FS, "too many children");
*indexp = index;
return 0; return 0;
} }
index = 0;
s = 0; s = 0;
while (low <= high) while (low <= high)
{ {
@@ -526,6 +526,10 @@ grub_nilfs2_btree_lookup (struct grub_nilfs2_data *data,
level = grub_nilfs2_btree_get_level (node); level = grub_nilfs2_btree_get_level (node);
found = grub_nilfs2_btree_node_lookup (data, node, key, &index); found = grub_nilfs2_btree_node_lookup (data, node, key, &index);
if (grub_errno != GRUB_ERR_NONE)
goto fail;
ptr = grub_nilfs2_btree_node_get_ptr (data, node, index); ptr = grub_nilfs2_btree_node_get_ptr (data, node, index);
if (need_translate) if (need_translate)
ptr = grub_nilfs2_dat_translate (data, ptr); ptr = grub_nilfs2_dat_translate (data, ptr);
@@ -550,7 +554,8 @@ grub_nilfs2_btree_lookup (struct grub_nilfs2_data *data,
else else
index = 0; index = 0;
if (index < grub_nilfs2_btree_node_nchildren_max (data, node)) if (index < grub_nilfs2_btree_node_nchildren_max (data, node) &&
grub_errno == GRUB_ERR_NONE)
{ {
ptr = grub_nilfs2_btree_node_get_ptr (data, node, index); ptr = grub_nilfs2_btree_node_get_ptr (data, node, index);
if (need_translate) if (need_translate)