From 42edda8db68f619aa9b08de10cdda6b752c2f901 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sun, 16 Apr 2023 07:14:41 -0400 Subject: [PATCH] Update bcachefs sources to 22ccceee15 bcachefs: Fix a slab-out-of-bounds --- .bcachefs_revision | 2 +- libbcachefs/alloc_background.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bcachefs_revision b/.bcachefs_revision index 192f42e..02a8395 100644 --- a/.bcachefs_revision +++ b/.bcachefs_revision @@ -1 +1 @@ -504729f99c4e1655be1da3e8c62d20b790483eba +22ccceee1555cd9a66f0b444634a7c0099a73d77 diff --git a/libbcachefs/alloc_background.c b/libbcachefs/alloc_background.c index aef796b..8ce2027 100644 --- 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; -- 2.39.2