diff for duplicates of <20170126123715.GA7785@mobilestation> diff --git a/a/1.txt b/N1/1.txt index bad9888..db8e461 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,10 +16,11 @@ On Tue, Jan 24, 2017 at 02:38:38PM +0000, Colin King <colin.king@canonical.com> > +++ 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) +> csraddr_str = +> kmalloc(sizeof(char)*(csraddr_len + 1), GFP_KERNEL); +> - if (csraddr_str == NULL) > - return -ENOMEM; -> + if (csraddr_str = NULL) { +> + if (csraddr_str == NULL) { > + ret = -ENOMEM; > + goto free_buf; > + } diff --git a/a/content_digest b/N1/content_digest index e8ab501..e4249aa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020170124143838.9694-1-colin.king@canonical.com\0" "From\0Serge Semin <fancer.lancer@gmail.com>\0" "Subject\0Re: [PATCH] eeprom: fix memory leak on buf when failed allocation of csraddr_str\0" - "Date\0Thu, 26 Jan 2017 12:37:15 +0000\0" + "Date\0Thu, 26 Jan 2017 15:37:15 +0300\0" "To\0Colin King <colin.king@canonical.com>\0" "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>" linux-kernel@vger.kernel.org @@ -26,10 +26,11 @@ "> +++ b/drivers/misc/eeprom/idt_89hpesx.c\n" "> @@ -965,8 +965,10 @@ static ssize_t idt_dbgfs_csr_write(struct file *filep, const char __user *ubuf,\n" "> \t\tcsraddr_len = colon_ch - buf;\n" - "> \t\tcsraddr_str > \t\t\tkmalloc(sizeof(char)*(csraddr_len + 1), GFP_KERNEL);\n" - "> -\t\tif (csraddr_str = NULL)\n" + "> \t\tcsraddr_str =\n" + "> \t\t\tkmalloc(sizeof(char)*(csraddr_len + 1), GFP_KERNEL);\n" + "> -\t\tif (csraddr_str == NULL)\n" "> -\t\t\treturn -ENOMEM;\n" - "> +\t\tif (csraddr_str = NULL) {\n" + "> +\t\tif (csraddr_str == NULL) {\n" "> +\t\t\tret = -ENOMEM;\n" "> +\t\t\tgoto free_buf;\n" "> +\t\t}\n" @@ -44,4 +45,4 @@ "\n" Acked-by: Serge Semin <fancer.lancer@gmail.com> -b61dd45de8f02188168cb102dad57c5b0fccffbc67088452e98218698152e61b +d635c0ee9112df8936ad0c75f7c0da922a1392ad1f48cf1a7721aad9a9f940ac
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.