Skip to content

Commit c0ade5d

Browse files
mingnusMikulas Patocka
authored andcommitted
dm cache: fix potential out-of-bounds access on the first resume
Out-of-bounds access occurs if the fast device is expanded unexpectedly before the first-time resume of the cache table. This happens because expanding the fast device requires reloading the cache table for cache_create to allocate new in-core data structures that fit the new size, and the check in cache_preresume is not performed during the first resume, leading to the issue. Reproduce steps: 1. prepare component devices: dmsetup create cmeta --table "0 8192 linear /dev/sdc 0" dmsetup create cdata --table "0 65536 linear /dev/sdc 8192" dmsetup create corig --table "0 524288 linear /dev/sdc 262144" dd if=/dev/zero of=/dev/mapper/cmeta bs=4k count=1 oflag=direct 2. load a cache table of 512 cache blocks, and deliberately expand the fast device before resuming the cache, making the in-core data structures inadequate. dmsetup create cache --notable dmsetup reload cache --table "0 524288 cache /dev/mapper/cmeta \ /dev/mapper/cdata /dev/mapper/corig 128 2 metadata2 writethrough smq 0" dmsetup reload cdata --table "0 131072 linear /dev/sdc 8192" dmsetup resume cdata dmsetup resume cache 3. suspend the cache to write out the in-core dirty bitset and hint array, leading to out-of-bounds access to the dirty bitset at offset 0x40: dmsetup suspend cache KASAN reports: BUG: KASAN: vmalloc-out-of-bounds in is_dirty_callback+0x2b/0x80 Read of size 8 at addr ffffc90000085040 by task dmsetup/90 (...snip...) The buggy address belongs to the virtual mapping at [ffffc90000085000, ffffc90000087000) created by: cache_ctr+0x176a/0x35f0 (...snip...) Memory state around the buggy address: ffffc90000084f00: f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 ffffc90000084f80: f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 >ffffc90000085000: 00 00 00 00 00 00 00 00 f8 f8 f8 f8 f8 f8 f8 f8 ^ ffffc90000085080: f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 ffffc90000085100: f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 Fix by checking the size change on the first resume. Signed-off-by: Ming-Hung Tsai <[email protected]> Fixes: f494a9c ("dm cache: cache shrinking support") Cc: [email protected] Signed-off-by: Mikulas Patocka <[email protected]> Acked-by: Joe Thornber <[email protected]>
1 parent f484697 commit c0ade5d

File tree

1 file changed

+16
-21
lines changed

1 file changed

+16
-21
lines changed

drivers/md/dm-cache-target.c

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2901,24 +2901,24 @@ static dm_cblock_t get_cache_dev_size(struct cache *cache)
29012901
static bool can_resize(struct cache *cache, dm_cblock_t new_size)
29022902
{
29032903
if (from_cblock(new_size) > from_cblock(cache->cache_size)) {
2904-
if (cache->sized) {
2905-
DMERR("%s: unable to extend cache due to missing cache table reload",
2906-
cache_device_name(cache));
2907-
return false;
2908-
}
2904+
DMERR("%s: unable to extend cache due to missing cache table reload",
2905+
cache_device_name(cache));
2906+
return false;
29092907
}
29102908

29112909
/*
29122910
* We can't drop a dirty block when shrinking the cache.
29132911
*/
2914-
new_size = to_cblock(find_next_bit(cache->dirty_bitset,
2915-
from_cblock(cache->cache_size),
2916-
from_cblock(new_size)));
2917-
if (new_size != cache->cache_size) {
2918-
DMERR("%s: unable to shrink cache; cache block %llu is dirty",
2919-
cache_device_name(cache),
2920-
(unsigned long long) from_cblock(new_size));
2921-
return false;
2912+
if (cache->loaded_mappings) {
2913+
new_size = to_cblock(find_next_bit(cache->dirty_bitset,
2914+
from_cblock(cache->cache_size),
2915+
from_cblock(new_size)));
2916+
if (new_size != cache->cache_size) {
2917+
DMERR("%s: unable to shrink cache; cache block %llu is dirty",
2918+
cache_device_name(cache),
2919+
(unsigned long long) from_cblock(new_size));
2920+
return false;
2921+
}
29222922
}
29232923

29242924
return true;
@@ -2949,20 +2949,15 @@ static int cache_preresume(struct dm_target *ti)
29492949
/*
29502950
* Check to see if the cache has resized.
29512951
*/
2952-
if (!cache->sized) {
2953-
r = resize_cache_dev(cache, csize);
2954-
if (r)
2955-
return r;
2956-
2957-
cache->sized = true;
2958-
2959-
} else if (csize != cache->cache_size) {
2952+
if (!cache->sized || csize != cache->cache_size) {
29602953
if (!can_resize(cache, csize))
29612954
return -EINVAL;
29622955

29632956
r = resize_cache_dev(cache, csize);
29642957
if (r)
29652958
return r;
2959+
2960+
cache->sized = true;
29662961
}
29672962

29682963
if (!cache->loaded_mappings) {

0 commit comments

Comments
 (0)