Patchwork ISDN, Gigaset: Fix memory leak in do_disconnect_req()

login
register
mail settings
Submitter Jesper Juhl
Date Dec. 26, 2010, 7:59 p.m.
Message ID <alpine.LNX.2.00.1012262053130.20797@swampdragon.chaosbits.net>
Download mbox | patch
Permalink /patch/76722/
State Accepted
Delegated to: David Miller
Headers show

Comments

Jesper Juhl - Dec. 26, 2010, 7:59 p.m.
Hi,

In drivers/isdn/gigaset/capi.c::do_disconnect_req() we will leak the 
memory allocated (with kmalloc) to 'b3cmsg' if the call to alloc_skb() 
fails.

...
		b3cmsg = kmalloc(sizeof(*b3cmsg), GFP_KERNEL);
	allocation here ------^
		if (!b3cmsg) {
			dev_err(cs->dev, "%s: out of memory\n", __func__);
			send_conf(iif, ap, skb, CAPI_MSGOSRESOURCEERR);
			return;
		}
		capi_cmsg_header(b3cmsg, ap->id, CAPI_DISCONNECT_B3, CAPI_IND,
				 ap->nextMessageNumber++,
				 cmsg->adr.adrPLCI | (1 << 16));
		b3cmsg->Reason_B3 = CapiProtocolErrorLayer1;
		b3skb = alloc_skb(CAPI_DISCONNECT_B3_IND_BASELEN, GFP_KERNEL);
		if (b3skb == NULL) {
			dev_err(cs->dev, "%s: out of memory\n", __func__);
			send_conf(iif, ap, skb, CAPI_MSGOSRESOURCEERR);
			return;
	leak here ------^
...

This leak is easily fixed by just kfree()'ing the memory allocated to 
'b3cmsg' right before we return. The following patch does that.


Signed-off-by: Jesper Juhl <jj@chaosbits.net>
---
 capi.c |    1 +
 1 file changed, 1 insertion(+)

  compile tested only since I have no way to actually test this.
Tilman Schmidt - Dec. 28, 2010, 5:42 p.m.
Quite correct. Thanks for finding and fixing this.

Am 26.12.2010 20:59 schrieb Jesper Juhl:
> Hi,
> 
> In drivers/isdn/gigaset/capi.c::do_disconnect_req() we will leak the 
> memory allocated (with kmalloc) to 'b3cmsg' if the call to alloc_skb() 
> fails.
> 
> ...
> 		b3cmsg = kmalloc(sizeof(*b3cmsg), GFP_KERNEL);
> 	allocation here ------^
> 		if (!b3cmsg) {
> 			dev_err(cs->dev, "%s: out of memory\n", __func__);
> 			send_conf(iif, ap, skb, CAPI_MSGOSRESOURCEERR);
> 			return;
> 		}
> 		capi_cmsg_header(b3cmsg, ap->id, CAPI_DISCONNECT_B3, CAPI_IND,
> 				 ap->nextMessageNumber++,
> 				 cmsg->adr.adrPLCI | (1 << 16));
> 		b3cmsg->Reason_B3 = CapiProtocolErrorLayer1;
> 		b3skb = alloc_skb(CAPI_DISCONNECT_B3_IND_BASELEN, GFP_KERNEL);
> 		if (b3skb == NULL) {
> 			dev_err(cs->dev, "%s: out of memory\n", __func__);
> 			send_conf(iif, ap, skb, CAPI_MSGOSRESOURCEERR);
> 			return;
> 	leak here ------^
> ...
> 
> This leak is easily fixed by just kfree()'ing the memory allocated to 
> 'b3cmsg' right before we return. The following patch does that.
> 
> 
> Signed-off-by: Jesper Juhl <jj@chaosbits.net>

Acked-by: Tilman Schmidt <tilman@imap.cc>

> ---
>  capi.c |    1 +
>  1 file changed, 1 insertion(+)
> 
>   compile tested only since I have no way to actually test this.
> 
> diff --git a/drivers/isdn/gigaset/capi.c b/drivers/isdn/gigaset/capi.c
> index bcc174e..658e75f 100644
> --- a/drivers/isdn/gigaset/capi.c
> +++ b/drivers/isdn/gigaset/capi.c
> @@ -1900,6 +1900,7 @@ static void do_disconnect_req(struct gigaset_capi_ctr *iif,
>  		if (b3skb == NULL) {
>  			dev_err(cs->dev, "%s: out of memory\n", __func__);
>  			send_conf(iif, ap, skb, CAPI_MSGOSRESOURCEERR);
> +			kfree(b3cmsg);
>  			return;
>  		}
>  		capi_cmsg2message(b3cmsg,
> 
>
David Miller - Dec. 31, 2010, 7:21 p.m.
From: Tilman Schmidt <tilman@imap.cc>
Date: Tue, 28 Dec 2010 18:42:29 +0100

> Quite correct. Thanks for finding and fixing this.
> 
> Am 26.12.2010 20:59 schrieb Jesper Juhl:
>> Hi,
>> 
>> In drivers/isdn/gigaset/capi.c::do_disconnect_req() we will leak the 
>> memory allocated (with kmalloc) to 'b3cmsg' if the call to alloc_skb() 
>> fails.
>> 
>> ...
>> 		b3cmsg = kmalloc(sizeof(*b3cmsg), GFP_KERNEL);
>> 	allocation here ------^
>> 		if (!b3cmsg) {
>> 			dev_err(cs->dev, "%s: out of memory\n", __func__);
>> 			send_conf(iif, ap, skb, CAPI_MSGOSRESOURCEERR);
>> 			return;
>> 		}
>> 		capi_cmsg_header(b3cmsg, ap->id, CAPI_DISCONNECT_B3, CAPI_IND,
>> 				 ap->nextMessageNumber++,
>> 				 cmsg->adr.adrPLCI | (1 << 16));
>> 		b3cmsg->Reason_B3 = CapiProtocolErrorLayer1;
>> 		b3skb = alloc_skb(CAPI_DISCONNECT_B3_IND_BASELEN, GFP_KERNEL);
>> 		if (b3skb == NULL) {
>> 			dev_err(cs->dev, "%s: out of memory\n", __func__);
>> 			send_conf(iif, ap, skb, CAPI_MSGOSRESOURCEERR);
>> 			return;
>> 	leak here ------^
>> ...
>> 
>> This leak is easily fixed by just kfree()'ing the memory allocated to 
>> 'b3cmsg' right before we return. The following patch does that.
>> 
>> 
>> Signed-off-by: Jesper Juhl <jj@chaosbits.net>
> 
> Acked-by: Tilman Schmidt <tilman@imap.cc>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/isdn/gigaset/capi.c b/drivers/isdn/gigaset/capi.c
index bcc174e..658e75f 100644
--- a/drivers/isdn/gigaset/capi.c
+++ b/drivers/isdn/gigaset/capi.c
@@ -1900,6 +1900,7 @@  static void do_disconnect_req(struct gigaset_capi_ctr *iif,
 		if (b3skb == NULL) {
 			dev_err(cs->dev, "%s: out of memory\n", __func__);
 			send_conf(iif, ap, skb, CAPI_MSGOSRESOURCEERR);
+			kfree(b3cmsg);
 			return;
 		}
 		capi_cmsg2message(b3cmsg,