* [PATCH] eeprom: fix memory leak on buf when failed allocation of csraddr_str
@ 2017-01-24 14:38 Colin King
2017-01-26 12:37 ` Serge Semin
0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2017-01-24 14:38 UTC (permalink / raw)
To: Greg Kroah-Hartman, Serge Semin, linux-kernel; +Cc: kernel-janitors
From: Colin Ian King <colin.king@canonical.com>
The error return path When csraddr_str fails to free buf, causing a
memory leak. Fix this by returning via the free_buf label that
performs the necessary cleanup.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/misc/eeprom/idt_89hpesx.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/misc/eeprom/idt_89hpesx.c b/drivers/misc/eeprom/idt_89hpesx.c
index 25d47d0..56bc5c2 100644
--- a/drivers/misc/eeprom/idt_89hpesx.c
+++ b/drivers/misc/eeprom/idt_89hpesx.c
@@ -965,8 +965,10 @@ static ssize_t idt_dbgfs_csr_write(struct file *filep, const char __user *ubuf,
csraddr_len = colon_ch - buf;
csraddr_str kmalloc(sizeof(char)*(csraddr_len + 1), GFP_KERNEL);
- if (csraddr_str = NULL)
- return -ENOMEM;
+ if (csraddr_str = NULL) {
+ ret = -ENOMEM;
+ goto free_buf;
+ }
/* Copy the register address to the substring buffer */
strncpy(csraddr_str, buf, csraddr_len);
csraddr_str[csraddr_len] = '\0';
--
2.10.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] eeprom: fix memory leak on buf when failed allocation of csraddr_str
2017-01-24 14:38 [PATCH] eeprom: fix memory leak on buf when failed allocation of csraddr_str Colin King
@ 2017-01-26 12:37 ` Serge Semin
0 siblings, 0 replies; 2+ messages in thread
From: Serge Semin @ 2017-01-26 12:37 UTC (permalink / raw)
To: Colin King; +Cc: Greg Kroah-Hartman, linux-kernel, kernel-janitors
On Tue, Jan 24, 2017 at 02:38:38PM +0000, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> The error return path When csraddr_str fails to free buf, causing a
> memory leak. Fix this by returning via the free_buf label that
> performs the necessary cleanup.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> drivers/misc/eeprom/idt_89hpesx.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/misc/eeprom/idt_89hpesx.c b/drivers/misc/eeprom/idt_89hpesx.c
> index 25d47d0..56bc5c2 100644
> --- a/drivers/misc/eeprom/idt_89hpesx.c
> +++ b/drivers/misc/eeprom/idt_89hpesx.c
> @@ -965,8 +965,10 @@ static ssize_t idt_dbgfs_csr_write(struct file *filep, const char __user *ubuf,
> csraddr_len = colon_ch - buf;
> csraddr_str > kmalloc(sizeof(char)*(csraddr_len + 1), GFP_KERNEL);
> - if (csraddr_str = NULL)
> - return -ENOMEM;
> + if (csraddr_str = NULL) {
> + ret = -ENOMEM;
> + goto free_buf;
> + }
> /* Copy the register address to the substring buffer */
> strncpy(csraddr_str, buf, csraddr_len);
> csraddr_str[csraddr_len] = '\0';
> --
> 2.10.2
>
Indeed. Thanks for the patch.
Acked-by: Serge Semin <fancer.lancer@gmail.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-26 12:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-24 14:38 [PATCH] eeprom: fix memory leak on buf when failed allocation of csraddr_str Colin King
2017-01-26 12:37 ` Serge Semin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox