LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH v2] staging: ft1000: ft1000-usb: ft1000_hw.c: Fix a potential memory leak.
@ 2014-12-29 12:41 Rickard Strandqvist
0 siblings, 0 replies; only message in thread
From: Rickard Strandqvist @ 2014-12-29 12:41 UTC (permalink / raw)
To: Marek Belisko, Greg Kroah-Hartman
Cc: Rickard Strandqvist, Gulsah Kose, Joe Perches, Monam Agarwal,
Tapasweni Pathak, Andrey Utkin, devel, linux-kernel
Avoid allocate memory if we will exit the function.
Was found by using a static code analysis program called cppcheck.
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
---
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index 08ce86a..502e16a 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -332,15 +332,15 @@ int card_send_command(struct ft1000_usb *ft1000dev, void *ptempbuffer,
pr_debug("enter card_send_command... size=%d\n", size);
+ ret = ft1000_read_register(ft1000dev, &temp, FT1000_REG_DOORBELL);
+ if (ret)
+ return ret;
+
commandbuf = kmalloc(size + 2, GFP_KERNEL);
if (!commandbuf)
return -ENOMEM;
memcpy((void *)commandbuf + 2, (void *)ptempbuffer, size);
- ret = ft1000_read_register(ft1000dev, &temp, FT1000_REG_DOORBELL);
- if (ret)
- return ret;
-
if (temp & 0x0100)
usleep_range(900, 1100);
--
1.7.10.4
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-12-29 12:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-29 12:41 [PATCH v2] staging: ft1000: ft1000-usb: ft1000_hw.c: Fix a potential memory leak Rickard Strandqvist
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).