hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: westbridge: improve error path 

kmalloc() may fail, check for it.
Allocated memory is not freed.
Use IS_ERR() instead of strict checking.

Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
Cc: David Cross <david.cross@cypress.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Vasiliy Kulikov 2010-09-05 22:32:53 +04:00 committed by Greg Kroah-Hartman
parent ec53d6123b
commit 7b1f6bfb03
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/westbridge/astoria/gadget/cyasgadget.c
View File

@ -1123,6 +1123,8 @@ static int cyasgadget_ioctl(
/* better use fixed size buff*/ /* better use fixed size buff*/
alloc_filename = kmalloc(k_d.name_length + 1, GFP_KERNEL); alloc_filename = kmalloc(k_d.name_length + 1, GFP_KERNEL);
if (alloc_filename == NULL)
return -ENOMEM;
/* get the filename */ /* get the filename */
if (copy_from_user(alloc_filename, k_d.file_name, if (copy_from_user(alloc_filename, k_d.file_name,
@ -1132,12 +1134,13 @@ static int cyasgadget_ioctl(
"copy file name from user space failed\n", "copy file name from user space failed\n",
__func__); __func__);
#endif #endif
kfree(alloc_filename);
return -EFAULT; return -EFAULT;
} }
file_to_allocate = filp_open(alloc_filename, O_RDWR, 0); file_to_allocate = filp_open(alloc_filename, O_RDWR, 0);
if ((int)file_to_allocate != 0xfffffffe) { if (!IS_ERR(file_to_allocate)) {
struct address_space *mapping = struct address_space *mapping =
file_to_allocate->f_mapping; file_to_allocate->f_mapping;
@ -1379,6 +1382,7 @@ static int cyasgadget_ioctl(
__func__, alloc_filename); __func__, alloc_filename);
} /* end if (file_to_allocate)*/ } /* end if (file_to_allocate)*/
#endif #endif
kfree(alloc_filename);
initsoj_safe_exit: initsoj_safe_exit:
ret_stat = 0; ret_stat = 0;
retval = __put_user(ret_stat, retval = __put_user(ret_stat,
@ -1410,12 +1414,15 @@ initsoj_safe_exit:
return -EFAULT; return -EFAULT;
map_filename = kmalloc(k_d.name_length + 1, GFP_KERNEL); map_filename = kmalloc(k_d.name_length + 1, GFP_KERNEL);
if (map_filename == NULL)
return -ENOMEM;
if (copy_from_user(map_filename, k_d.file_name, if (copy_from_user(map_filename, k_d.file_name,
k_d.name_length + 1)) { k_d.name_length + 1)) {
#ifndef WESTBRIDGE_NDEBUG #ifndef WESTBRIDGE_NDEBUG
cy_as_hal_print_message("%s: copy file name from " cy_as_hal_print_message("%s: copy file name from "
"user space failed\n", __func__); "user space failed\n", __func__);
#endif #endif
kfree(map_filename);
return -EFAULT; return -EFAULT;
} }
@ -1561,6 +1568,7 @@ initsoj_safe_exit:
__func__, map_filename); __func__, map_filename);
} }
#endif #endif
kfree(map_filename);
ret_stat = 0; ret_stat = 0;
retval = __put_user(ret_stat, (uint32_t __user *) retval = __put_user(ret_stat, (uint32_t __user *)