[PATCH OLK-5.10] btrfs: don't BUG_ON on ENOMEM from btrfs_lookup_extent_info() in walk_down_proc() - Kernel

29 Sep 2024

From: Josef Bacik josef@toxicpanda.com
mainline inclusion
from mainline-v6.11-rc1
commit a580fb2c3479d993556e1c31b237c9e5be4944a3
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAU9LZ
CVE: CVE-2024-46841
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...
--------------------------------
We handle errors here properly, ENOMEM isn't fatal, return the error.
Signed-off-by: Josef Bacik josef@toxicpanda.com
Reviewed-by: David Sterba dsterba@suse.com
Signed-off-by: David Sterba dsterba@suse.com
Conflicts:
    fs/btrfs/extent-tree.c
[Context difference.]
Signed-off-by: Yifan Qiao qiaoyifan4@huawei.com
---
 fs/btrfs/extent-tree.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index ae6625aa2c4a..854c7fa0fc06 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -4872,7 +4872,6 @@ static noinline int walk_down_proc(struct btrfs_trans_handle *trans,
    				       eb->start, level, 1,
    				       &wc->refs[level],
    				       &wc->flags[level]);
-		BUG_ON(ret == -ENOMEM);
    	if (ret)
    		return ret;
    	BUG_ON(wc->refs[level] == 0);
-- 
2.39.2


    