Update bcachefs sources to 22ccceee15 bcachefs: Fix a slab-out-of-bounds

diff --git a/.bcachefs_revision b/.bcachefs_revision
index 192f42ea9bbc57652a8344a95ea453d518b7e30e..02a8395071bf892a102ef46b27d076b3ea51cb6d 100644 (file)
--- a/.bcachefs_revision
+++ b/.bcachefs_revision
@@ -1 +1 @@
-504729f99c4e1655be1da3e8c62d20b790483eba
+22ccceee1555cd9a66f0b444634a7c0099a73d77

diff --git a/libbcachefs/alloc_background.c b/libbcachefs/alloc_background.c
index aef796b5a48a45953ca55ad0df6a49532817d665..8ce2027d10f4d64dbc0e764d9b559b4aa7ca06f8 100644 (file)
--- a/libbcachefs/alloc_background.c
+++ b/libbcachefs/alloc_background.c
@@ -479,7 +479,7 @@ __bch2_alloc_to_v4_mut(struct btree_trans *trans, struct bkey_s_c k)
 {
        struct bkey_i_alloc_v4 *ret;
 
-       ret = bch2_trans_kmalloc(trans, sizeof(struct bkey_i_alloc_v4));
+       ret = bch2_trans_kmalloc(trans, max(bkey_bytes(k.k), sizeof(struct bkey_i_alloc_v4)));
        if (IS_ERR(ret))
                return ret;