leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm switch: simplify conditional in alloc_region_table()

Browse Source 
The variable sctx->nr_regions has type unsigned long and the variable
nr_regions has type sector_t.

Thus the variables may be different when overflow happens.
Changed the conditional to "if (nr_regions >= ULONG_MAX)".
Also move the assignment of nr_regions after sector_div()
and the sanity check which looks more sane.

Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Reviewed-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
This commit is contained in:
Tomohiro Kusumi 2015-10-29 03:54:21 +09:00 committed by Mike Snitzer
parent f49e869a61
commit aad9ae4550
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/md/dm-switch.c
View File

@ -99,11 +99,11 @@ static int alloc_region_table(struct dm_target *ti, unsigned nr_paths)
if (sector_div(nr_regions, sctx->region_size)) if (sector_div(nr_regions, sctx->region_size))
nr_regions++; nr_regions++;
sctx->nr_regions = nr_regions; if (nr_regions >= ULONG_MAX) {
if (sctx->nr_regions != nr_regions || sctx->nr_regions >= ULONG_MAX) {
ti->error = "Region table too large"; ti->error = "Region table too large";
return -EINVAL; return -EINVAL;
} }
sctx->nr_regions = nr_regions;
nr_slots = nr_regions; nr_slots = nr_regions;
if (sector_div(nr_slots, sctx->region_entries_per_slot)) if (sector_div(nr_slots, sctx->region_entries_per_slot))