block/keyslot-manager: prevent crash when num_slots=1
Subsystems (2)
Eric Biggers
maintainerPATCH v2 1/1 block/keyslot-manager: prevent crash when num_slots=1
From: Eric Biggers <[email protected]>
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--- block/keyslot-manager.c | 7 +++++++ 1 file changed, 7 insertions(+)
block/keyslot-manager.c +7 -0
@@ -103,6 +103,13 @@ int blk_ksm_init(struct blk_keyslot_manager *ksm, unsigned int num_slots)spin_lock_init (&ksm->idle_slots_lock); slot_hashtable_size =roundup_pow_of_two (num_slots); +/* +* hash_ptr() assumes bits != 0, so ensure the hash table has at least 2 +* buckets. This only makes a difference when there is only 1 keyslot. +*/ +if (slot_hashtable_size <2 ) + slot_hashtable_size =2 ; + ksm->log_slot_ht_size =ilog2 (slot_hashtable_size); ksm->slot_hashtable = kvmalloc_array(slot_hashtable_size, sizeof(ksm->slot_hashtable[0]),
base-commit: f8394f232b1eab649ce2df5c5f15b0e528c92091
Signature · 1 line
2.29.2
Eric Biggers
maintainerQuoted 30 lines · Eric Biggers
From: Eric Biggers <[email protected]>
If there is only one keyslot, then
blk_ksm_init()computes slot_hashtable_size=1 and log_slot_ht_size=0. This causesblk_ksm_find_keyslot()to crash later because it useshash_ptr(key, log_slot_ht_size)to find the hash bucket containing the key, andhash_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=1Fixes 1b2628397058 ("block: Keyslot Manager for Inline Encryption")Signed-off-by Eric Biggers <[email protected]>--- block/keyslot-manager.c | 7 +++++++ 1 file changed, 7 insertions(+)block/keyslot-manager.c +0
-0@@ -103,6 +103,13 @@ int blk_ksm_init(struct blk_keyslot_manager *ksm, unsigned int num_slots)spin_lock_init (&ksm->idle_slots_lock); slot_hashtable_size =roundup_pow_of_two (num_slots);
block/keyslot-manager.c int blk_ksm_init(struct blk_keyslot_manager *ksm, unsigned int num_slots) · line 115
Quoted 10 lines
block/keyslot-manager.c +7
-0+/* +* hash_ptr() assumes bits != 0, so ensure the hash table has at least 2 +* buckets. This only makes a difference when there is only 1 keyslot. +*/ +if (slot_hashtable_size <2 ) + slot_hashtable_size =2 ; + ksm->log_slot_ht_size =ilog2 (slot_hashtable_size); ksm->slot_hashtable = kvmalloc_array(slot_hashtable_size, sizeof(ksm->slot_hashtable[0]),
Ping?
Jens Axboe
maintainerQuoted 8 lines · Eric Biggers
From: Eric Biggers <[email protected]>
If there is only one keyslot, then
blk_ksm_init()computes slot_hashtable_size=1 and log_slot_ht_size=0. This causesblk_ksm_find_keyslot()to crash later because it useshash_ptr(key, log_slot_ht_size)to find the hash bucket containing the key, andhash_ptr()doesn't support the bits == 0 case.
Quoted 6 lines
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
Applied for 5.10, thanks.
Signature · 1 line
Jens Axboe