[PATCH] rt2x00: Don't leak mem in error path of rt2x00lib_request_firmware()

Subsystems: networking drivers (wireless), the rest

STALE5755d

3 messages, 3 authors, 2011-01-11 · open the first message on its own page

[PATCH] rt2x00: Don't leak mem in error path of rt2x00lib_request_firmware()

From: Jesper Juhl <hidden>
Date: 2011-01-10 23:47:47

We need to release_firmware() in order not to leak memory.

Signed-off-by: Jesper Juhl <redacted>
---
 rt2x00firmware.c |    1 +
 1 file changed, 1 insertion(+)
diff --git a/drivers/net/wireless/rt2x00/rt2x00firmware.c b/drivers/net/wireless/rt2x00/rt2x00firmware.c
index f0e1eb7..be0ff78 100644
--- a/drivers/net/wireless/rt2x00/rt2x00firmware.c
+++ b/drivers/net/wireless/rt2x00/rt2x00firmware.c
@@ -58,6 +58,7 @@ static int rt2x00lib_request_firmware(struct rt2x00_dev *rt2x00dev)
 
 	if (!fw || !fw->size || !fw->data) {
 		ERROR(rt2x00dev, "Failed to read Firmware.\n");
+		release_firmware(fw);
 		return -ENOENT;
 	}
 

-- 
Jesper Juhl <jj@chaosbits.net>            http://www.chaosbits.net/
Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please.

Re: [PATCH] rt2x00: Don't leak mem in error path of rt2x00lib_request_firmware()

From: Ivo Van Doorn <hidden>
Date: 2011-01-11 17:30:07

Hi,
We need to release_firmware() in order not to leak memory.

Signed-off-by: Jesper Juhl <redacted>
I can assume that release_firmware() checks if 'fw' is null?
If so:

Acked-by: Ivo van Doorn <redacted>
quoted hunk
---
 rt2x00firmware.c |    1 +
 1 file changed, 1 insertion(+)
diff --git a/drivers/net/wireless/rt2x00/rt2x00firmware.c b/drivers/net/wireless/rt2x00/rt2x00firmware.c
index f0e1eb7..be0ff78 100644
--- a/drivers/net/wireless/rt2x00/rt2x00firmware.c
+++ b/drivers/net/wireless/rt2x00/rt2x00firmware.c
@@ -58,6 +58,7 @@ static int rt2x00lib_request_firmware(struct rt2x00_dev *rt2x00dev)
       if (!fw || !fw->size || !fw->data) {
               ERROR(rt2x00dev, "Failed to read Firmware.\n");
+               release_firmware(fw);
               return -ENOENT;
       }



--
Jesper Juhl [off-list ref]            http://www.chaosbits.net/
Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please.

Re: [PATCH] rt2x00: Don't leak mem in error path of rt2x00lib_request_firmware()

From: Pekka Enberg <penberg@kernel.org>
Date: 2011-01-11 17:33:17

On Tue, Jan 11, 2011 at 7:30 PM, Ivo Van Doorn [off-list ref] wrote:
Hi,
quoted
We need to release_firmware() in order not to leak memory.

Signed-off-by: Jesper Juhl <redacted>
I can assume that release_firmware() checks if 'fw' is null?
Yes, it does.
If so:

Acked-by: Ivo van Doorn <redacted>
Acked-by: Pekka Enberg <penberg@kernel.org>
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help