Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1275110 > unrolled thread
| Started by | Wenwei Tao <ww.tao0320@gmail.com> |
|---|---|
| First post | 2015-11-23 09:30 +0100 |
| Last post | 2015-11-23 10:10 +0100 |
| Articles | 4 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] lightnvm: free allocated memory when gennvm register fails Wenwei Tao <ww.tao0320@gmail.com> - 2015-11-23 09:30 +0100
Re: [PATCH] lightnvm: free allocated memory when gennvm register fails Matias Bjørling <mb@lightnvm.io> - 2015-11-23 09:50 +0100
Re: [PATCH] lightnvm: free allocated memory when gennvm register fails Matias Bjørling <mb@lightnvm.io> - 2015-11-23 10:10 +0100
Re: [PATCH] lightnvm: free allocated memory when gennvm register fails Wenwei Tao <ww.tao0320@gmail.com> - 2015-11-23 10:10 +0100
| From | Wenwei Tao <ww.tao0320@gmail.com> |
|---|---|
| Date | 2015-11-23 09:30 +0100 |
| Subject | [PATCH] lightnvm: free allocated memory when gennvm register fails |
| Message-ID | <qxUFz-7Ir-1@gated-at.bofh.it> |
free allocated nvm block and gennvm lun structures when
gennvm register fails, otherwise it will cause memory leak.
Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com>
---
drivers/lightnvm/gennvm.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/lightnvm/gennvm.c b/drivers/lightnvm/gennvm.c
index ae1fb2b..03fc7a5 100644
--- a/drivers/lightnvm/gennvm.c
+++ b/drivers/lightnvm/gennvm.c
@@ -211,12 +211,15 @@ static int gennvm_register(struct nvm_dev *dev)
ret = gennvm_blocks_init(dev, gn);
if (ret) {
pr_err("gennvm: could not initialize blocks\n");
+ gennvm_blocks_free(dev);
+ gennvm_luns_free(dev);
goto err;
}
return 1;
err:
kfree(gn);
+ dev->mp = NULL;
return ret;
}
--
1.8.3.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Matias Bjørling <mb@lightnvm.io> |
|---|---|
| Date | 2015-11-23 09:50 +0100 |
| Subject | Re: [PATCH] lightnvm: free allocated memory when gennvm register fails |
| Message-ID | <qxUYV-7PE-9@gated-at.bofh.it> |
| In reply to | #1275110 |
On 11/23/2015 09:29 AM, Wenwei Tao wrote:
> free allocated nvm block and gennvm lun structures when
> gennvm register fails, otherwise it will cause memory leak.
>
> Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com>
> ---
> drivers/lightnvm/gennvm.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/lightnvm/gennvm.c b/drivers/lightnvm/gennvm.c
> index ae1fb2b..03fc7a5 100644
> --- a/drivers/lightnvm/gennvm.c
> +++ b/drivers/lightnvm/gennvm.c
> @@ -211,12 +211,15 @@ static int gennvm_register(struct nvm_dev *dev)
> ret = gennvm_blocks_init(dev, gn);
> if (ret) {
> pr_err("gennvm: could not initialize blocks\n");
> + gennvm_blocks_free(dev);
> + gennvm_luns_free(dev);
> goto err;
> }
>
> return 1;
> err:
> kfree(gn);
> + dev->mp = NULL;
> return ret;
> }
>
>
Thanks Tao, would it be okay with you if I apply the patch like this:
diff --git i/drivers/lightnvm/gennvm.c w/drivers/lightnvm/gennvm.c
index e20e74e..3969a98 100644
--- i/drivers/lightnvm/gennvm.c
+++ w/drivers/lightnvm/gennvm.c
@@ -207,6 +207,14 @@ static int gennvm_blocks_init(struct nvm_dev *dev,
struct gen_nvm *gn)
return 0;
}
+static void gennvm_free(struct nvm_dev *dev)
+{
+ gennvm_blocks_free(dev);
+ gennvm_luns_free(dev);
+ kfree(dev->mp);
+ dev->mp = NULL;
+}
+
static int gennvm_register(struct nvm_dev *dev)
{
struct gen_nvm *gn;
@@ -234,16 +242,13 @@ static int gennvm_register(struct nvm_dev *dev)
return 1;
err:
- kfree(gn);
+ gennvm_free(dev);
return ret;
}
static void gennvm_unregister(struct nvm_dev *dev)
{
- gennvm_blocks_free(dev);
- gennvm_luns_free(dev);
- kfree(dev->mp);
- dev->mp = NULL;
+ gennvm_free(dev);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Matias Bjørling <mb@lightnvm.io> |
|---|---|
| Date | 2015-11-23 10:10 +0100 |
| Subject | Re: [PATCH] lightnvm: free allocated memory when gennvm register fails |
| Message-ID | <qxVih-8cY-1@gated-at.bofh.it> |
| In reply to | #1275127 |
On 11/23/2015 10:00 AM, Wenwei Tao wrote:
> This is okay with me.
Great, I'll go ahead and apply it.
>
> 2015-11-23 16:47 GMT+08:00 Matias Bjørling <mb@lightnvm.io>:
>> On 11/23/2015 09:29 AM, Wenwei Tao wrote:
>>>
>>> free allocated nvm block and gennvm lun structures when
>>> gennvm register fails, otherwise it will cause memory leak.
>>>
>>> Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com>
>>> ---
>>> drivers/lightnvm/gennvm.c | 3 +++
>>> 1 file changed, 3 insertions(+)
>>>
>>> diff --git a/drivers/lightnvm/gennvm.c b/drivers/lightnvm/gennvm.c
>>> index ae1fb2b..03fc7a5 100644
>>> --- a/drivers/lightnvm/gennvm.c
>>> +++ b/drivers/lightnvm/gennvm.c
>>> @@ -211,12 +211,15 @@ static int gennvm_register(struct nvm_dev *dev)
>>> ret = gennvm_blocks_init(dev, gn);
>>> if (ret) {
>>> pr_err("gennvm: could not initialize blocks\n");
>>> + gennvm_blocks_free(dev);
>>> + gennvm_luns_free(dev);
>>> goto err;
>>> }
>>>
>>> return 1;
>>> err:
>>> kfree(gn);
>>> + dev->mp = NULL;
>>> return ret;
>>> }
>>>
>>>
>> Thanks Tao, would it be okay with you if I apply the patch like this:
>>
>> diff --git i/drivers/lightnvm/gennvm.c w/drivers/lightnvm/gennvm.c
>> index e20e74e..3969a98 100644
>> --- i/drivers/lightnvm/gennvm.c
>> +++ w/drivers/lightnvm/gennvm.c
>> @@ -207,6 +207,14 @@ static int gennvm_blocks_init(struct nvm_dev *dev,
>> struct gen_nvm *gn)
>> return 0;
>> }
>>
>> +static void gennvm_free(struct nvm_dev *dev)
>> +{
>> + gennvm_blocks_free(dev);
>> + gennvm_luns_free(dev);
>> + kfree(dev->mp);
>> + dev->mp = NULL;
>> +}
>> +
>> static int gennvm_register(struct nvm_dev *dev)
>> {
>> struct gen_nvm *gn;
>> @@ -234,16 +242,13 @@ static int gennvm_register(struct nvm_dev *dev)
>>
>> return 1;
>> err:
>> - kfree(gn);
>> + gennvm_free(dev);
>> return ret;
>> }
>>
>> static void gennvm_unregister(struct nvm_dev *dev)
>> {
>> - gennvm_blocks_free(dev);
>> - gennvm_luns_free(dev);
>> - kfree(dev->mp);
>> - dev->mp = NULL;
>> + gennvm_free(dev);
>> }
>>
>>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Wenwei Tao <ww.tao0320@gmail.com> |
|---|---|
| Date | 2015-11-23 10:10 +0100 |
| Message-ID | <qxVih-8cY-3@gated-at.bofh.it> |
| In reply to | #1275127 |
This is okay with me.
2015-11-23 16:47 GMT+08:00 Matias Bjørling <mb@lightnvm.io>:
> On 11/23/2015 09:29 AM, Wenwei Tao wrote:
>>
>> free allocated nvm block and gennvm lun structures when
>> gennvm register fails, otherwise it will cause memory leak.
>>
>> Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com>
>> ---
>> drivers/lightnvm/gennvm.c | 3 +++
>> 1 file changed, 3 insertions(+)
>>
>> diff --git a/drivers/lightnvm/gennvm.c b/drivers/lightnvm/gennvm.c
>> index ae1fb2b..03fc7a5 100644
>> --- a/drivers/lightnvm/gennvm.c
>> +++ b/drivers/lightnvm/gennvm.c
>> @@ -211,12 +211,15 @@ static int gennvm_register(struct nvm_dev *dev)
>> ret = gennvm_blocks_init(dev, gn);
>> if (ret) {
>> pr_err("gennvm: could not initialize blocks\n");
>> + gennvm_blocks_free(dev);
>> + gennvm_luns_free(dev);
>> goto err;
>> }
>>
>> return 1;
>> err:
>> kfree(gn);
>> + dev->mp = NULL;
>> return ret;
>> }
>>
>>
> Thanks Tao, would it be okay with you if I apply the patch like this:
>
> diff --git i/drivers/lightnvm/gennvm.c w/drivers/lightnvm/gennvm.c
> index e20e74e..3969a98 100644
> --- i/drivers/lightnvm/gennvm.c
> +++ w/drivers/lightnvm/gennvm.c
> @@ -207,6 +207,14 @@ static int gennvm_blocks_init(struct nvm_dev *dev,
> struct gen_nvm *gn)
> return 0;
> }
>
> +static void gennvm_free(struct nvm_dev *dev)
> +{
> + gennvm_blocks_free(dev);
> + gennvm_luns_free(dev);
> + kfree(dev->mp);
> + dev->mp = NULL;
> +}
> +
> static int gennvm_register(struct nvm_dev *dev)
> {
> struct gen_nvm *gn;
> @@ -234,16 +242,13 @@ static int gennvm_register(struct nvm_dev *dev)
>
> return 1;
> err:
> - kfree(gn);
> + gennvm_free(dev);
> return ret;
> }
>
> static void gennvm_unregister(struct nvm_dev *dev)
> {
> - gennvm_blocks_free(dev);
> - gennvm_luns_free(dev);
> - kfree(dev->mp);
> - dev->mp = NULL;
> + gennvm_free(dev);
> }
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web