]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
eeprom: fix memory leak on buf when failed allocation of csraddr_str
authorColin Ian King <colin.king@canonical.com>
Tue, 24 Jan 2017 14:38:38 +0000 (14:38 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 Jan 2017 10:41:44 +0000 (11:41 +0100)
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/eeprom/idt_89hpesx.c

index 25d47d09e1cb173f373e60e00c951b8afd54d5d6..56bc5c2dfe6089442bcd73a32f5f8f53af304887 100644 (file)
@@ -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';