From: Andrew Morton <akpm@osdl.org>
To: Panagiotis Issaris <takis@lumumba.uhasselt.be>
Cc: linux-kernel@vger.kernel.org, paulus@samba.org,
linux-ppp@vger.kernel.org
Subject: Re: [PATCH] Missing failure handling
Date: Tue, 25 Jul 2006 08:24:53 +0000 [thread overview]
Message-ID: <20060725012453.5765d1f6.akpm@osdl.org> (raw)
In-Reply-To: <20060720191629.GD7643@lumumba.uhasselt.be>
On Thu, 20 Jul 2006 21:16:29 +0200
takis@lumumba.uhasselt.be (Panagiotis Issaris) wrote:
> From: Panagiotis Issaris <takis@issaris.org>
>
> The PPP code contains two kmalloc()s followed by memset()s without
> handling a possible memory allocation failure. (Suggested by
> Joe Perches).
>
> And furthermore, conversions from kmalloc+memset to kzalloc.
OK...
> - struct cardmap *np = kmalloc(sizeof(*np), GFP_KERNEL);
> - memset(np, 0, sizeof(*np));
> + struct cardmap *np = kzalloc(sizeof(*np), GFP_KERNEL);
> + if (!np) {
> + printk(KERN_ERR "PPP: no memory (cardmap)\n");
> + return -ENOMEM;
> + }
> np->ptr[0] = p;
> if (p != NULL) {
> np->shift = p->shift + CARDMAP_ORDER;
> @@ -2719,8 +2727,11 @@ static void cardmap_set(struct cardmap *
> while (p->shift > 0) {
> i = (nr >> p->shift) & CARDMAP_MASK;
> if (p->ptr[i] = NULL) {
> - struct cardmap *np = kmalloc(sizeof(*np), GFP_KERNEL);
> - memset(np, 0, sizeof(*np));
> + struct cardmap *np = kzalloc(sizeof(*np), GFP_KERNEL);
> + if (!np) {
> + printk(KERN_ERR "PPP: no memory (cardmap)\n");
> + return -ENOMEM;
> + }
> np->shift = p->shift - CARDMAP_ORDER;
But this leaks memory on errors.
It looks like cardmap_destroy() will handle a partially-constructed map,
so..
--- a/drivers/net/ppp_generic.c~ppp-handle-kmalloc-failures-leak-fix
+++ a/drivers/net/ppp_generic.c
@@ -2710,10 +2710,8 @@ static int cardmap_set(struct cardmap **
do {
/* need a new top level */
struct cardmap *np = kzalloc(sizeof(*np), GFP_KERNEL);
- if (!np) {
- printk(KERN_ERR "PPP: no memory (cardmap)\n");
- return -ENOMEM;
- }
+ if (!np)
+ goto enomem;
np->ptr[0] = p;
if (p != NULL) {
np->shift = p->shift + CARDMAP_ORDER;
@@ -2728,10 +2726,8 @@ static int cardmap_set(struct cardmap **
i = (nr >> p->shift) & CARDMAP_MASK;
if (p->ptr[i] = NULL) {
struct cardmap *np = kzalloc(sizeof(*np), GFP_KERNEL);
- if (!np) {
- printk(KERN_ERR "PPP: no memory (cardmap)\n");
- return -ENOMEM;
- }
+ if (!np)
+ goto enomem;
np->shift = p->shift - CARDMAP_ORDER;
np->parent = p;
p->ptr[i] = np;
@@ -2747,6 +2743,10 @@ static int cardmap_set(struct cardmap **
else
clear_bit(i, &p->inuse);
return 0;
+enomem:
+ printk(KERN_ERR "PPP: no memory (cardmap)\n");
+ cardmap_destroy(pmap);
+ return -ENOMEM;
}
static unsigned int cardmap_find_first_free(struct cardmap *map)
_
next prev parent reply other threads:[~2006-07-25 8:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-20 19:16 [PATCH] Missing failure handling Panagiotis Issaris
2006-07-25 8:24 ` Andrew Morton [this message]
2006-08-01 4:29 ` Paul Mackerras
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=20060725012453.5765d1f6.akpm@osdl.org \
--to=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-ppp@vger.kernel.org \
--cc=paulus@samba.org \
--cc=takis@lumumba.uhasselt.be \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox