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

dm zoned: fix uninitialized pointer dereference

Browse Source 
Make sure that the local variable rzone in dmz_do_reclaim() is always
initialized before being used for printing debug messages.

Fixes: f97809aec5 ("dm zoned: per-device reclaim")
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
This commit is contained in:
Damien Le Moal
2020-06-08 13:20:59 +09:00
committed by Mike Snitzer
parent b3a9e3b962
commit c69cb1d17b
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/md/dm-zoned-reclaim.c
View File

@@ -377,6 +377,7 @@ static int dmz_do_reclaim(struct dmz_reclaim *zrc)
dmz_metadata_label(zmd), zrc->dev_idx); dmz_metadata_label(zmd), zrc->dev_idx);
return -EBUSY; return -EBUSY;
} }
rzone = dzone;
start = jiffies; start = jiffies;
if (dmz_is_cache(dzone) || dmz_is_rnd(dzone)) { if (dmz_is_cache(dzone) || dmz_is_rnd(dzone)) {
@@ -391,8 +392,6 @@ static int dmz_do_reclaim(struct dmz_reclaim *zrc)
*/ */
ret = dmz_reclaim_rnd_data(zrc, dzone); ret = dmz_reclaim_rnd_data(zrc, dzone);
} }
rzone = dzone;
} else { } else {
struct dm_zone *bzone = dzone->bzone; struct dm_zone *bzone = dzone->bzone;
sector_t chunk_block = 0; sector_t chunk_block = 0;
@@ -415,7 +414,6 @@ static int dmz_do_reclaim(struct dmz_reclaim *zrc)
* be later reclaimed. * be later reclaimed.
*/ */
ret = dmz_reclaim_seq_data(zrc, dzone); ret = dmz_reclaim_seq_data(zrc, dzone);
rzone = dzone;
} }
} }
out: out: