summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorToshi Kani <toshi.kani@hpe.com>2017-07-07 17:44:26 -0600
committerDan Williams <dan.j.williams@intel.com>2017-07-17 11:43:58 -0700
commit4e3f0701f25ab194c5362576b1146a1e6cc6c2e7 (patch)
tree4ca26b53cd5798187dcd89b6ed0a32d5f2b20a64 /drivers
parent5771a8c08880cdca3bfb4a3fc6d309d6bba20877 (diff)
downloadlinux-stable-4e3f0701f25ab194c5362576b1146a1e6cc6c2e7.tar.gz
linux-stable-4e3f0701f25ab194c5362576b1146a1e6cc6c2e7.tar.bz2
linux-stable-4e3f0701f25ab194c5362576b1146a1e6cc6c2e7.zip
libnvdimm: fix badblock range handling of ARS range
__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: 0caeef63e6d2 ("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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/nvdimm/core.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/nvdimm/core.c b/drivers/nvdimm/core.c
index 7cd99b1f8596..75bc08c6838c 100644
--- a/drivers/nvdimm/core.c
+++ b/drivers/nvdimm/core.c
@@ -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;