Skip to content

Commit

Permalink
libnvdimm, pmem: fix kmap_atomic() leak in error path
Browse files Browse the repository at this point in the history
When we enounter a bad block we need to kunmap_atomic() before
returning.

Cc: <stable@vger.kernel.org>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Reviewed-by: Vishal Verma <vishal.l.verma@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
  • Loading branch information
Dan Williams committed Mar 9, 2016
1 parent d4f3236 commit b5ebc8e
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions drivers/nvdimm/pmem.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,22 +66,25 @@ static int pmem_do_bvec(struct pmem_device *pmem, struct page *page,
unsigned int len, unsigned int off, int rw,
sector_t sector)
{
int rc = 0;
void *mem = kmap_atomic(page);
phys_addr_t pmem_off = sector * 512 + pmem->data_offset;
void __pmem *pmem_addr = pmem->virt_addr + pmem_off;

if (rw == READ) {
if (unlikely(is_bad_pmem(&pmem->bb, sector, len)))
return -EIO;
memcpy_from_pmem(mem + off, pmem_addr, len);
flush_dcache_page(page);
rc = -EIO;
else {
memcpy_from_pmem(mem + off, pmem_addr, len);
flush_dcache_page(page);
}
} else {
flush_dcache_page(page);
memcpy_to_pmem(pmem_addr, mem + off, len);
}

kunmap_atomic(mem);
return 0;
return rc;
}

static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)
Expand Down

0 comments on commit b5ebc8e

Please sign in to comment.