xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drivers/md/md-bitmap: check the return value of md_bitmap_get_counter()

Browse Source 
[ Upstream commit 3bd548e5b819b8c0f2c9085de775c5c7bff9052f ]

Check the return value of md_bitmap_get_counter() in case it returns
NULL pointer, which will result in a null pointer dereference.

v2: update the check to include other dereference

Signed-off-by: Li Zhong <floridsleeves@gmail.com>
Signed-off-by: Song Liu <song@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Li Zhong
2022-09-16 16:33:05 -07:00
committed by Greg Kroah-Hartman
parent 7d86851c30
commit 100caacfa0
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/md/md-bitmap.c
View File

@@ -2196,10 +2196,12 @@ int md_bitmap_resize(struct bitmap *bitmap, sector_t blocks,
if (set) { if (set) {
bmc_new = md_bitmap_get_counter(&bitmap->counts, block, &new_blocks, 1); bmc_new = md_bitmap_get_counter(&bitmap->counts, block, &new_blocks, 1);
if (bmc_new) {
if (*bmc_new == 0) { if (*bmc_new == 0) {
/* need to set on-disk bits too. */ /* need to set on-disk bits too. */
sector_t end = block + new_blocks; sector_t end = block + new_blocks;
sector_t start = block >> chunkshift; sector_t start = block >> chunkshift;
start <<= chunkshift; start <<= chunkshift;
while (start < end) { while (start < end) {
md_bitmap_file_set_bit(bitmap, block); md_bitmap_file_set_bit(bitmap, block);
@@ -2210,6 +2212,7 @@ int md_bitmap_resize(struct bitmap *bitmap, sector_t blocks,
md_bitmap_set_pending(&bitmap->counts, block); md_bitmap_set_pending(&bitmap->counts, block);
} }
*bmc_new |= NEEDED_MASK; *bmc_new |= NEEDED_MASK;
}
if (new_blocks < old_blocks) if (new_blocks < old_blocks)
old_blocks = new_blocks; old_blocks = new_blocks;
} }