From: Kent Overstreet Date: Wed, 29 Dec 2021 16:27:47 +0000 (-0500) Subject: bcachefs: Fix keylist size in btree_update X-Git-Tag: v6.7-rc1~201^2~1214 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74ef5b0d3f3f8e290686b309ae595559a8963fde;p=thirdparty%2Fkernel%2Flinux.git bcachefs: Fix keylist size in btree_update This fixes a buffer overrun, fortunately caught by a BUG_ON(). Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/btree_update_interior.h b/fs/bcachefs/btree_update_interior.h index 8cf59cee6e4e2..8dc86fa636d68 100644 --- a/fs/bcachefs/btree_update_interior.h +++ b/fs/bcachefs/btree_update_interior.h @@ -82,12 +82,12 @@ struct btree_update { /* Nodes being freed: */ struct keylist old_keys; u64 _old_keys[BTREE_UPDATE_NODES_MAX * - BKEY_BTREE_PTR_VAL_U64s_MAX]; + BKEY_BTREE_PTR_U64s_MAX]; /* Nodes being added: */ struct keylist new_keys; u64 _new_keys[BTREE_UPDATE_NODES_MAX * - BKEY_BTREE_PTR_VAL_U64s_MAX]; + BKEY_BTREE_PTR_U64s_MAX]; /* New nodes, that will be made reachable by this update: */ struct btree *new_nodes[BTREE_UPDATE_NODES_MAX];