From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:45572 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754191AbcDIXpx (ORCPT ); Sat, 9 Apr 2016 19:45:53 -0400 Subject: Patch "libnvdimm, pmem: fix kmap_atomic() leak in error path" has been added to the 4.5-stable tree To: dan.j.williams@intel.com, gregkh@linuxfoundation.org, ross.zwisler@linux.intel.com, vishal.l.verma@intel.com Cc: , From: Date: Sat, 09 Apr 2016 16:45:51 -0700 Message-ID: <146024555118140@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled libnvdimm, pmem: fix kmap_atomic() leak in error path to the 4.5-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: libnvdimm-pmem-fix-kmap_atomic-leak-in-error-path.patch and it can be found in the queue-4.5 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From b5ebc8ec693281c3c1efff7459a069cbd8b9a149 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sun, 6 Mar 2016 15:20:51 -0800 Subject: libnvdimm, pmem: fix kmap_atomic() leak in error path From: Dan Williams commit b5ebc8ec693281c3c1efff7459a069cbd8b9a149 upstream. When we enounter a bad block we need to kunmap_atomic() before returning. Cc: Ross Zwisler Reviewed-by: Vishal Verma Signed-off-by: Dan Williams Signed-off-by: Greg Kroah-Hartman --- drivers/nvdimm/pmem.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -66,22 +66,25 @@ static int pmem_do_bvec(struct pmem_devi 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) Patches currently in stable-queue which might be from dan.j.williams@intel.com are queue-4.5/libnvdimm-fix-security-issue-with-dsm-ioctl.patch queue-4.5/libnvdimm-pmem-fix-kmap_atomic-leak-in-error-path.patch