From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Fri, 5 Feb 2016 18:24:26 -0700 From: Ross Zwisler Subject: Re: [PATCH] devm_memremap: Fix error value when memremap failed Message-ID: <20160206012426.GA12447@linux.intel.com> References: <1454722827-15744-1-git-send-email-toshi.kani@hpe.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1454722827-15744-1-git-send-email-toshi.kani@hpe.com> Sender: owner-linux-mm@kvack.org To: Toshi Kani Cc: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org List-ID: On Fri, Feb 05, 2016 at 06:40:27PM -0700, Toshi Kani wrote: > devm_memremap() returns an ERR_PTR() value in case of error. > However, it returns NULL when memremap() failed. This causes > the caller, such as the pmem driver, to proceed and oops later. > > Change devm_memremap() to return ERR_PTR(-ENXIO) when memremap() > failed. > > Signed-off-by: Toshi Kani > Cc: Dan Williams > Cc: Andrew Morton Yep, good catch. Reviewed-by: Ross Zwisler > --- > kernel/memremap.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/kernel/memremap.c b/kernel/memremap.c > index 70ee377..3427cca 100644 > --- a/kernel/memremap.c > +++ b/kernel/memremap.c > @@ -136,8 +136,10 @@ void *devm_memremap(struct device *dev, resource_size_t offset, > if (addr) { > *ptr = addr; > devres_add(dev, ptr); > - } else > + } else { > devres_free(ptr); > + return ERR_PTR(-ENXIO); > + } > > return addr; > } > _______________________________________________ > Linux-nvdimm mailing list > Linux-nvdimm@lists.01.org > https://lists.01.org/mailman/listinfo/linux-nvdimm -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751298AbcBFBYf (ORCPT ); Fri, 5 Feb 2016 20:24:35 -0500 Received: from mga11.intel.com ([192.55.52.93]:60786 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750748AbcBFBYe (ORCPT ); Fri, 5 Feb 2016 20:24:34 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,403,1449561600"; d="scan'208";a="878205044" Date: Fri, 5 Feb 2016 18:24:26 -0700 From: Ross Zwisler To: Toshi Kani Cc: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-nvdimm@ml01.01.org Subject: Re: [PATCH] devm_memremap: Fix error value when memremap failed Message-ID: <20160206012426.GA12447@linux.intel.com> References: <1454722827-15744-1-git-send-email-toshi.kani@hpe.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1454722827-15744-1-git-send-email-toshi.kani@hpe.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Feb 05, 2016 at 06:40:27PM -0700, Toshi Kani wrote: > devm_memremap() returns an ERR_PTR() value in case of error. > However, it returns NULL when memremap() failed. This causes > the caller, such as the pmem driver, to proceed and oops later. > > Change devm_memremap() to return ERR_PTR(-ENXIO) when memremap() > failed. > > Signed-off-by: Toshi Kani > Cc: Dan Williams > Cc: Andrew Morton Yep, good catch. Reviewed-by: Ross Zwisler > --- > kernel/memremap.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/kernel/memremap.c b/kernel/memremap.c > index 70ee377..3427cca 100644 > --- a/kernel/memremap.c > +++ b/kernel/memremap.c > @@ -136,8 +136,10 @@ void *devm_memremap(struct device *dev, resource_size_t offset, > if (addr) { > *ptr = addr; > devres_add(dev, ptr); > - } else > + } else { > devres_free(ptr); > + return ERR_PTR(-ENXIO); > + } > > return addr; > } > _______________________________________________ > Linux-nvdimm mailing list > Linux-nvdimm@lists.01.org > https://lists.01.org/mailman/listinfo/linux-nvdimm