| Message ID | 20190425175440.9354-2-pasha.tatashin@soleen.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | "Hotremove" persistent memory | expand |
On 4/25/19 10:54 AM, Pavel Tatashin wrote: > rc = add_memory(numa_node, new_res->start, resource_size(new_res)); > - if (rc) > + if (rc) { > + release_resource(new_res); > + kfree(new_res); > return rc; > + } Looks good to me: Reviewed-by: Dave Hansen <dave.hansen@intel.com>
On Thu, Apr 25, 2019 at 2:32 PM Dave Hansen <dave.hansen@intel.com> wrote: > > On 4/25/19 10:54 AM, Pavel Tatashin wrote: > > rc = add_memory(numa_node, new_res->start, resource_size(new_res)); > > - if (rc) > > + if (rc) { > > + release_resource(new_res); > > + kfree(new_res); > > return rc; > > + } > > Looks good to me: > > Reviewed-by: Dave Hansen <dave.hansen@intel.com> Thank you Dave. Pasha
diff --git a/drivers/dax/kmem.c b/drivers/dax/kmem.c index a02318c6d28a..4c0131857133 100644 --- a/drivers/dax/kmem.c +++ b/drivers/dax/kmem.c @@ -66,8 +66,11 @@ int dev_dax_kmem_probe(struct device *dev) new_res->name = dev_name(dev); rc = add_memory(numa_node, new_res->start, resource_size(new_res)); - if (rc) + if (rc) { + release_resource(new_res); + kfree(new_res); return rc; + } return 0; }
When add_memory() function fails, the resource and the memory should be freed. Fixes: c221c0b0308f ("device-dax: "Hotplug" persistent memory for use like normal RAM") Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com> --- drivers/dax/kmem.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)