* [PATCH] devm_memremap: Fix error value when memremap failed
@ 2016-02-06 1:40 Toshi Kani
2016-02-06 1:24 ` Ross Zwisler
2016-02-06 1:49 ` Dan Williams
0 siblings, 2 replies; 4+ messages in thread
From: Toshi Kani @ 2016-02-06 1:40 UTC (permalink / raw)
To: akpm, dan.j.williams; +Cc: linux-nvdimm, linux-mm, linux-kernel, Toshi Kani
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 <toshi.kani@hpe.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
---
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;
}
--
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: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] devm_memremap: Fix error value when memremap failed
2016-02-06 1:40 [PATCH] devm_memremap: Fix error value when memremap failed Toshi Kani
@ 2016-02-06 1:24 ` Ross Zwisler
2016-02-06 1:49 ` Dan Williams
1 sibling, 0 replies; 4+ messages in thread
From: Ross Zwisler @ 2016-02-06 1:24 UTC (permalink / raw)
To: Toshi Kani; +Cc: akpm, dan.j.williams, linux-mm, linux-kernel, linux-nvdimm
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 <toshi.kani@hpe.com>
> Cc: Dan Williams <dan.j.williams@intel.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>
Yep, good catch.
Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
> ---
> 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: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] devm_memremap: Fix error value when memremap failed
2016-02-06 1:40 [PATCH] devm_memremap: Fix error value when memremap failed Toshi Kani
2016-02-06 1:24 ` Ross Zwisler
@ 2016-02-06 1:49 ` Dan Williams
2016-02-06 1:52 ` Dan Williams
1 sibling, 1 reply; 4+ messages in thread
From: Dan Williams @ 2016-02-06 1:49 UTC (permalink / raw)
To: Toshi Kani; +Cc: Andrew Morton, linux-nvdimm, Linux MM, linux-kernel
On Fri, Feb 5, 2016 at 5:40 PM, Toshi Kani <toshi.kani@hpe.com> 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 <toshi.kani@hpe.com>
> Cc: Dan Williams <dan.j.williams@intel.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Dan Williams <dan.j.williams@intel.com>
--
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: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] devm_memremap: Fix error value when memremap failed
2016-02-06 1:49 ` Dan Williams
@ 2016-02-06 1:52 ` Dan Williams
0 siblings, 0 replies; 4+ messages in thread
From: Dan Williams @ 2016-02-06 1:52 UTC (permalink / raw)
To: Toshi Kani; +Cc: Andrew Morton, linux-nvdimm, Linux MM, linux-kernel
On Fri, Feb 5, 2016 at 5:49 PM, Dan Williams <dan.j.williams@intel.com> wrote:
> On Fri, Feb 5, 2016 at 5:40 PM, Toshi Kani <toshi.kani@hpe.com> 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 <toshi.kani@hpe.com>
>> Cc: Dan Williams <dan.j.williams@intel.com>
>> Cc: Andrew Morton <akpm@linux-foundation.org>
>
> Acked-by: Dan Williams <dan.j.williams@intel.com>
Should also go to -stable, I'll add that and include this with some
other fixes I have brewing.
--
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: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-02-06 1:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-06 1:40 [PATCH] devm_memremap: Fix error value when memremap failed Toshi Kani
2016-02-06 1:24 ` Ross Zwisler
2016-02-06 1:49 ` Dan Williams
2016-02-06 1:52 ` Dan Williams
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox