From: Serge Semin <fancer.lancer@gmail.com>
To: Colin King <colin.king@canonical.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] eeprom: fix memory leak on buf when failed allocation of csraddr_str
Date: Thu, 26 Jan 2017 12:37:15 +0000 [thread overview]
Message-ID: <20170126123715.GA7785@mobilestation> (raw)
In-Reply-To: <20170124143838.9694-1-colin.king@canonical.com>
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>
WARNING: multiple messages have this Message-ID (diff)
From: Serge Semin <fancer.lancer@gmail.com>
To: Colin King <colin.king@canonical.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] eeprom: fix memory leak on buf when failed allocation of csraddr_str
Date: Thu, 26 Jan 2017 15:37:15 +0300 [thread overview]
Message-ID: <20170126123715.GA7785@mobilestation> (raw)
In-Reply-To: <20170124143838.9694-1-colin.king@canonical.com>
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>
next prev parent reply other threads:[~2017-01-26 12:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-24 14:38 [PATCH] eeprom: fix memory leak on buf when failed allocation of csraddr_str Colin King
2017-01-24 14:38 ` Colin King
2017-01-26 12:37 ` Serge Semin [this message]
2017-01-26 12:37 ` Serge Semin
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=20170126123715.GA7785@mobilestation \
--to=fancer.lancer@gmail.com \
--cc=colin.king@canonical.com \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.