Skip to content

Commit

Permalink
libnvdimm: fix badblock range handling of ARS range
Browse files Browse the repository at this point in the history
__add_badblock_range() does not account sector alignment when
it sets 'num_sectors'.  Therefore, an ARS error record range
spanning across two sectors is set to a single sector length,
which leaves the 2nd sector unprotected.

Change __add_badblock_range() to set 'num_sectors' properly.

Cc: <stable@vger.kernel.org>
Fixes: 0caeef6 ("libnvdimm: Add a poison list and export badblocks")
Signed-off-by: Toshi Kani <toshi.kani@hpe.com>
Reviewed-by: Vishal Verma <vishal.l.verma@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
  • Loading branch information
Toshi Kani authored and Dan Williams committed Jul 17, 2017
1 parent 5771a8c commit 4e3f070
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/nvdimm/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -421,14 +421,15 @@ static void set_badblock(struct badblocks *bb, sector_t s, int num)
static void __add_badblock_range(struct badblocks *bb, u64 ns_offset, u64 len)
{
const unsigned int sector_size = 512;
sector_t start_sector;
sector_t start_sector, end_sector;
u64 num_sectors;
u32 rem;

start_sector = div_u64(ns_offset, sector_size);
num_sectors = div_u64_rem(len, sector_size, &rem);
end_sector = div_u64_rem(ns_offset + len, sector_size, &rem);
if (rem)
num_sectors++;
end_sector++;
num_sectors = end_sector - start_sector;

if (unlikely(num_sectors > (u64)INT_MAX)) {
u64 remaining = num_sectors;
Expand Down

0 comments on commit 4e3f070

Please sign in to comment.