From: Dan Carpenter <dan.carpenter@oracle.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>,
Laura Abbott <lauraa@codeaurora.org>,
Olof Johansson <olof@lixom.net>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
Jan Kara <jack@suse.cz>, Toshi Kikuchi <toshik@chromium.org>,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch] genalloc: freeing const data pointers
Date: Sun, 19 Jul 2015 10:53:19 +0000 [thread overview]
Message-ID: <20150719105319.GC8410@mwanda> (raw)
"pool->name" can be kmalloc()ed or const so we need to free it with
kfree_const().
I also cleaned up the error path in devm_gen_pool_create() a bit. With
the current code you have to change the kfree() in multiple places
which is bug prone (my first draft of this patch had a bug).
Fixes: e89a70fd54f2 ('genalloc: add support of multiple gen_pools per device')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/lib/genalloc.c b/lib/genalloc.c
index 794804b..c729113 100644
--- a/lib/genalloc.c
+++ b/lib/genalloc.c
@@ -253,7 +253,7 @@ void gen_pool_destroy(struct gen_pool *pool)
kfree(chunk);
}
- kfree(pool->name);
+ kfree_const(pool->name);
kfree(pool);
}
EXPORT_SYMBOL(gen_pool_destroy);
@@ -631,23 +631,25 @@ struct gen_pool *devm_gen_pool_create(struct device *dev, int min_alloc_order,
}
ptr = devres_alloc(devm_gen_pool_release, sizeof(*ptr), GFP_KERNEL);
- if (!ptr) {
- kfree(pool_name);
- return ERR_PTR(-ENOMEM);
- }
+ if (!ptr)
+ goto free_pool_name;
pool = gen_pool_create(min_alloc_order, nid);
- if (pool) {
- *ptr = pool;
- pool->name = pool_name;
- devres_add(dev, ptr);
- } else {
- devres_free(ptr);
- kfree(pool_name);
- return ERR_PTR(-ENOMEM);
- }
+ if (!pool)
+ goto free_devres;
+
+ *ptr = pool;
+ pool->name = pool_name;
+ devres_add(dev, ptr);
return pool;
+
+free_devres:
+ devres_free(ptr);
+free_pool_name:
+ kfree_const(pool_name);
+
+ return ERR_PTR(-ENOMEM);
}
EXPORT_SYMBOL(devm_gen_pool_create);
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>,
Laura Abbott <lauraa@codeaurora.org>,
Olof Johansson <olof@lixom.net>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
Jan Kara <jack@suse.cz>, Toshi Kikuchi <toshik@chromium.org>,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch] genalloc: freeing const data pointers
Date: Sun, 19 Jul 2015 13:53:19 +0300 [thread overview]
Message-ID: <20150719105319.GC8410@mwanda> (raw)
"pool->name" can be kmalloc()ed or const so we need to free it with
kfree_const().
I also cleaned up the error path in devm_gen_pool_create() a bit. With
the current code you have to change the kfree() in multiple places
which is bug prone (my first draft of this patch had a bug).
Fixes: e89a70fd54f2 ('genalloc: add support of multiple gen_pools per device')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/lib/genalloc.c b/lib/genalloc.c
index 794804b..c729113 100644
--- a/lib/genalloc.c
+++ b/lib/genalloc.c
@@ -253,7 +253,7 @@ void gen_pool_destroy(struct gen_pool *pool)
kfree(chunk);
}
- kfree(pool->name);
+ kfree_const(pool->name);
kfree(pool);
}
EXPORT_SYMBOL(gen_pool_destroy);
@@ -631,23 +631,25 @@ struct gen_pool *devm_gen_pool_create(struct device *dev, int min_alloc_order,
}
ptr = devres_alloc(devm_gen_pool_release, sizeof(*ptr), GFP_KERNEL);
- if (!ptr) {
- kfree(pool_name);
- return ERR_PTR(-ENOMEM);
- }
+ if (!ptr)
+ goto free_pool_name;
pool = gen_pool_create(min_alloc_order, nid);
- if (pool) {
- *ptr = pool;
- pool->name = pool_name;
- devres_add(dev, ptr);
- } else {
- devres_free(ptr);
- kfree(pool_name);
- return ERR_PTR(-ENOMEM);
- }
+ if (!pool)
+ goto free_devres;
+
+ *ptr = pool;
+ pool->name = pool_name;
+ devres_add(dev, ptr);
return pool;
+
+free_devres:
+ devres_free(ptr);
+free_pool_name:
+ kfree_const(pool_name);
+
+ return ERR_PTR(-ENOMEM);
}
EXPORT_SYMBOL(devm_gen_pool_create);
next reply other threads:[~2015-07-19 10:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-19 10:53 Dan Carpenter [this message]
2015-07-19 10:53 ` [patch] genalloc: freeing const data pointers Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150719105319.GC8410@mwanda \
--to=dan.carpenter@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=catalin.marinas@arm.com \
--cc=jack@suse.cz \
--cc=kernel-janitors@vger.kernel.org \
--cc=lauraa@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=olof@lixom.net \
--cc=toshik@chromium.org \
--cc=vladimir_zapolskiy@mentor.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.