Skip to contentSkip to conversation

lightnvm: free allocated memory when gennvm register fails

PATCH In review Wenwei Tao 2 participants 4 messages Nov 23, 2015

lore
Share & tools
lore

Wenwei Tao

author
#0 lore raw

PATCH 1/1 lightnvm: free allocated memory when gennvm register fails

free allocated nvm block and gennvm lun structures when gennvm register fails, otherwise it will cause memory leak.

---
 drivers/lightnvm/gennvm.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/lightnvm/gennvm.c +3 -0
index ae1fb2b..03fc7a5 100644
@@ -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;
 }
 
Signature · 1 line
1.8.3.1
#1 lore raw
Quoted 19 lines · Wenwei Tao

free allocated nvm block and gennvm lun structures when gennvm register fails, otherwise it will cause memory leak.

---
  drivers/lightnvm/gennvm.c | 3 +++
  1 file changed, 3 insertions(+)
drivers/lightnvm/gennvm.c +2 -0
index ae1fb2b..03fc7a5 100644
@@ -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);

drivers/lightnvm/gennvm.c static int gennvm_register(struct nvm_dev *dev) · line 225

Quoted 10 lines
drivers/lightnvm/gennvm.c +1 -0
  		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:

drivers/lightnvm/gennvm.c +10 -5
index e20e74e..3969a98 100644
@@ -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);
 }
 
 
author
#2 lore raw

This is okay with me.

2015-11-23 16:47 GMT+08:00 Matias Bjørling <[email protected]>:

Quoted 72 lines · Wenwei Tao
Quoted 20 lines

free allocated nvm block and gennvm lun structures when gennvm register fails, otherwise it will cause memory leak.

---
  drivers/lightnvm/gennvm.c | 3 +++
  1 file changed, 3 insertions(+)
drivers/lightnvm/gennvm.c +2 -0
index ae1fb2b..03fc7a5 100644
@@ -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);

drivers/lightnvm/gennvm.c static int gennvm_register(struct nvm_dev *dev) · line 225

Quoted 10 lines
drivers/lightnvm/gennvm.c +1 -0
                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:

drivers/lightnvm/gennvm.c +8 -0
index e20e74e..3969a98 100644
@@ -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;
drivers/lightnvm/gennvm.c +2 -5
@@ -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);
 }
 
 
#3 lore raw
Quoted 1 line · Wenwei Tao

This is okay with me.

Great, I'll go ahead and apply it.

Quoted 74 lines

2015-11-23 16:47 GMT+08:00 Matias Bjørling <[email protected]>:

Quoted 72 lines · Wenwei Tao
Quoted 20 lines

free allocated nvm block and gennvm lun structures when gennvm register fails, otherwise it will cause memory leak.

---
   drivers/lightnvm/gennvm.c | 3 +++
   1 file changed, 3 insertions(+)
drivers/lightnvm/gennvm.c +2 -0
index ae1fb2b..03fc7a5 100644
@@ -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);

drivers/lightnvm/gennvm.c static int gennvm_register(struct nvm_dev *dev) · line 225

Quoted 10 lines
drivers/lightnvm/gennvm.c +1 -0
                 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:

drivers/lightnvm/gennvm.c +8 -0
index e20e74e..3969a98 100644
@@ -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;
drivers/lightnvm/gennvm.c +2 -5
@@ -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);
  }