Skip to content

Commit 47a8465

Browse files
ebiggersaxboe
authored andcommitted
block/keyslot-manager: prevent crash when num_slots=1
If there is only one keyslot, then blk_ksm_init() computes slot_hashtable_size=1 and log_slot_ht_size=0. This causes blk_ksm_find_keyslot() to crash later because it uses hash_ptr(key, log_slot_ht_size) to find the hash bucket containing the key, and hash_ptr() doesn't support the bits == 0 case. Fix this by making the hash table always have at least 2 buckets. Tested by running: kvm-xfstests -c ext4 -g encrypt -m inlinecrypt \ -o blk-crypto-fallback.num_keyslots=1 Fixes: 1b26283 ("block: Keyslot Manager for Inline Encryption") Signed-off-by: Eric Biggers <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent 45f703a commit 47a8465

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

block/keyslot-manager.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,13 @@ int blk_ksm_init(struct blk_keyslot_manager *ksm, unsigned int num_slots)
103103
spin_lock_init(&ksm->idle_slots_lock);
104104

105105
slot_hashtable_size = roundup_pow_of_two(num_slots);
106+
/*
107+
* hash_ptr() assumes bits != 0, so ensure the hash table has at least 2
108+
* buckets. This only makes a difference when there is only 1 keyslot.
109+
*/
110+
if (slot_hashtable_size < 2)
111+
slot_hashtable_size = 2;
112+
106113
ksm->log_slot_ht_size = ilog2(slot_hashtable_size);
107114
ksm->slot_hashtable = kvmalloc_array(slot_hashtable_size,
108115
sizeof(ksm->slot_hashtable[0]),

0 commit comments

Comments
 (0)