Skip to contentSkip to conversation

staging: westbridge: improve error path

PATCH In review Kulikov Vasiliy 3 participants 5 messages Sep 5, 2010 – Sep 8, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 9/14 staging: westbridge: improve error path

From: Vasiliy Kulikov <[email protected]>

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

---
I couldn't compile this driver at all, so it is not tested.

 .../staging/westbridge/astoria/gadget/cyasgadget.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
drivers/staging/westbridge/astoria/gadget/cyasgadget.c +9 -1
index ced239d..48080b3 100644
@@ -1123,6 +1123,8 @@ static int cyasgadget_ioctl(
 
 		/* better use fixed size buff*/
 		alloc_filename = kmalloc(k_d.name_length + 1, GFP_KERNEL);
+		if (alloc_filename = NULL)
+			return -ENOMEM;
 
 		/* get the filename */
 		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",
 				__func__);
 			#endif
+			kfree(alloc_filename);
 			return -EFAULT;
 		}
 
 		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  				file_to_allocate->f_mapping;
@@ -1379,6 +1382,7 @@ static int cyasgadget_ioctl(
 				__func__, alloc_filename);
 		} /* end if (file_to_allocate)*/
 		#endif
+		kfree(alloc_filename);
 initsoj_safe_exit:
 			ret_stat = 0;
 			retval = __put_user(ret_stat,
@@ -1410,12 +1414,15 @@ initsoj_safe_exit:
 				return -EFAULT;
 
 		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,
 			k_d.name_length + 1)) {
 			#ifndef WESTBRIDGE_NDEBUG
 			cy_as_hal_print_message("%s: copy file name from "
 				"user space failed\n", __func__);
 			#endif
+			kfree(map_filename);
 			return -EFAULT;
 		}
 
@@ -1561,6 +1568,7 @@ initsoj_safe_exit:
 					__func__, map_filename);
 		}
 		#endif
+		kfree(map_filename);
 
 		ret_stat = 0;
 		retval = __put_user(ret_stat, (uint32_t __user *)
Signature · 1 line
1.7.0.4
#1 lore raw
Quoted 53 lines · Kulikov Vasiliy

From: Vasiliy Kulikov <[email protected]>

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

---
I couldn't compile this driver at all, so it is not tested.

 .../staging/westbridge/astoria/gadget/cyasgadget.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
drivers/staging/westbridge/astoria/gadget/cyasgadget.c +6 -1
index ced239d..48080b3 100644
@@ -1123,6 +1123,8 @@ static int cyasgadget_ioctl(
 
 		/* better use fixed size buff*/
 		alloc_filename = kmalloc(k_d.name_length + 1, GFP_KERNEL);
+		if (alloc_filename = NULL)
+			return -ENOMEM;
 
 		/* get the filename */
 		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",
 				__func__);
 			#endif
+			kfree(alloc_filename);
 			return -EFAULT;
 		}
 
 		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 >  				file_to_allocate->f_mapping;
@@ -1379,6 +1382,7 @@ static int cyasgadget_ioctl(
 				__func__, alloc_filename);
 		} /* end if (file_to_allocate)*/
 		#endif
+		kfree(alloc_filename);
 initsoj_safe_exit:
 			ret_stat = 0;
 			retval = __put_user(ret_stat,
@@ -1410,12 +1414,15 @@ initsoj_safe_exit:
 				return -EFAULT;
 
 		map_filename = kmalloc(k_d.name_length + 1, GFP_KERNEL);
+		if (map_filename = NULL)

drivers/staging/westbridge/astoria/gadget/cyasgadget.c initsoj_safe_exit: · line 1427

Quoted 10 lines
drivers/staging/westbridge/astoria/gadget/cyasgadget.c +2 -0
+			return -ENOMEM;
 		if (copy_from_user(map_filename, k_d.file_name,
 			k_d.name_length + 1)) {
 			#ifndef WESTBRIDGE_NDEBUG
 			cy_as_hal_print_message("%s: copy file name from "
 				"user space failed\n", __func__);
 			#endif
+			kfree(map_filename);
 			return -EFAULT;
 		}

the indention should be fixed also.

re,
wh

Quoted 8 lines
drivers/staging/westbridge/astoria/gadget/cyasgadget.c +1 -0
@@ -1561,6 +1568,7 @@ initsoj_safe_exit:
 					__func__, map_filename);
 		}
 		#endif
+		kfree(map_filename);
 
 		ret_stat = 0;
 		retval = __put_user(ret_stat, (uint32_t __user *)
#2 lore raw
Quoted 1 line · walter harms

the indention should be fixed also.

Yes, the indentation for the whole file should be fixed, but that's not what this patch was doing.

Remember, a patch should only do one thing at a time.

thanks,

greg k-h

#3 lore raw
Quoted 8 lines · Greg KH
Quoted 1 line · walter harms

the indention should be fixed also.

Yes, the indentation for the whole file should be fixed, but that's not what this patch was doing.

Remember, a patch should only do one thing at a time.

that is true,
but in this special case i nearly missed the #if because it is so hidden in the code. IMHO that is enough for an exception.

re,
wh

#4 lore raw
Quoted 9 lines · walter harms
Quoted 6 lines · Greg KH
Quoted 1 line · walter harms

the indention should be fixed also.

Yes, the indentation for the whole file should be fixed, but that's not what this patch was doing.

Quoted 6 lines
Quoted 2 lines

Remember, a patch should only do one thing at a time.

that is true,
but in this special case i nearly missed the #if because it is so hidden in the code. IMHO that is enough for an exception.

This whole driver needs major help. But again, one thing at a time please.

thanks,

greg k-h