1*4882a593SmuzhiyunFrom ca5d9ac206043b1fb4cb06259272fb1c5946bb6d Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Daniel Axtens <dja@axtens.net> 3*4882a593SmuzhiyunDate: Mon, 18 Jan 2021 17:06:19 +1100 4*4882a593SmuzhiyunSubject: [PATCH] fs/nilfs2: Properly bail on errors in 5*4882a593Smuzhiyun grub_nilfs2_btree_node_lookup() 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunWe just introduced an error return in grub_nilfs2_btree_node_lookup(). 8*4882a593SmuzhiyunMake sure the callers catch it. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunAt the same time, make sure that grub_nilfs2_btree_node_lookup() always 11*4882a593Smuzhiyuninits the index pointer passed to it. 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunSigned-off-by: Daniel Axtens <dja@axtens.net> 14*4882a593SmuzhiyunReviewed-by: Daniel Kiper <daniel.kiper@oracle.com> 15*4882a593SmuzhiyunSigned-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com> 16*4882a593Smuzhiyun--- 17*4882a593Smuzhiyun grub-core/fs/nilfs2.c | 11 ++++++++--- 18*4882a593Smuzhiyun 1 file changed, 8 insertions(+), 3 deletions(-) 19*4882a593Smuzhiyun 20*4882a593Smuzhiyundiff --git a/grub-core/fs/nilfs2.c b/grub-core/fs/nilfs2.c 21*4882a593Smuzhiyunindex 43ac1ad..aaba002 100644 22*4882a593Smuzhiyun--- a/grub-core/fs/nilfs2.c 23*4882a593Smuzhiyun+++ b/grub-core/fs/nilfs2.c 24*4882a593Smuzhiyun@@ -433,7 +433,7 @@ grub_nilfs2_btree_node_lookup (struct grub_nilfs2_data *data, 25*4882a593Smuzhiyun grub_uint64_t key, int *indexp) 26*4882a593Smuzhiyun { 27*4882a593Smuzhiyun grub_uint64_t nkey; 28*4882a593Smuzhiyun- int index, low, high, s; 29*4882a593Smuzhiyun+ int index = 0, low, high, s; 30*4882a593Smuzhiyun 31*4882a593Smuzhiyun low = 0; 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun@@ -441,10 +441,10 @@ grub_nilfs2_btree_node_lookup (struct grub_nilfs2_data *data, 34*4882a593Smuzhiyun if (high >= grub_nilfs2_btree_node_nchildren_max (data, node)) 35*4882a593Smuzhiyun { 36*4882a593Smuzhiyun grub_error (GRUB_ERR_BAD_FS, "too many children"); 37*4882a593Smuzhiyun+ *indexp = index; 38*4882a593Smuzhiyun return 0; 39*4882a593Smuzhiyun } 40*4882a593Smuzhiyun 41*4882a593Smuzhiyun- index = 0; 42*4882a593Smuzhiyun s = 0; 43*4882a593Smuzhiyun while (low <= high) 44*4882a593Smuzhiyun { 45*4882a593Smuzhiyun@@ -526,6 +526,10 @@ grub_nilfs2_btree_lookup (struct grub_nilfs2_data *data, 46*4882a593Smuzhiyun level = grub_nilfs2_btree_get_level (node); 47*4882a593Smuzhiyun 48*4882a593Smuzhiyun found = grub_nilfs2_btree_node_lookup (data, node, key, &index); 49*4882a593Smuzhiyun+ 50*4882a593Smuzhiyun+ if (grub_errno != GRUB_ERR_NONE) 51*4882a593Smuzhiyun+ goto fail; 52*4882a593Smuzhiyun+ 53*4882a593Smuzhiyun ptr = grub_nilfs2_btree_node_get_ptr (data, node, index); 54*4882a593Smuzhiyun if (need_translate) 55*4882a593Smuzhiyun ptr = grub_nilfs2_dat_translate (data, ptr); 56*4882a593Smuzhiyun@@ -550,7 +554,8 @@ grub_nilfs2_btree_lookup (struct grub_nilfs2_data *data, 57*4882a593Smuzhiyun else 58*4882a593Smuzhiyun index = 0; 59*4882a593Smuzhiyun 60*4882a593Smuzhiyun- if (index < grub_nilfs2_btree_node_nchildren_max (data, node)) 61*4882a593Smuzhiyun+ if (index < grub_nilfs2_btree_node_nchildren_max (data, node) && 62*4882a593Smuzhiyun+ grub_errno == GRUB_ERR_NONE) 63*4882a593Smuzhiyun { 64*4882a593Smuzhiyun ptr = grub_nilfs2_btree_node_get_ptr (data, node, index); 65*4882a593Smuzhiyun if (need_translate) 66*4882a593Smuzhiyun-- 67*4882a593Smuzhiyun2.14.2 68*4882a593Smuzhiyun 69