]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
bcachefs: Fix keylist size in btree_update
authorKent Overstreet <kent.overstreet@gmail.com>
Wed, 29 Dec 2021 16:27:47 +0000 (11:27 -0500)
committerKent Overstreet <kent.overstreet@linux.dev>
Sun, 22 Oct 2023 21:09:20 +0000 (17:09 -0400)
This fixes a buffer overrun, fortunately caught by a BUG_ON().

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
fs/bcachefs/btree_update_interior.h

index 8cf59cee6e4e28461467f670dbad6b73f97c57f2..8dc86fa636d680900034d8c1b9efd0c1374d0b15 100644 (file)
@@ -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];