[BLUETOOTH]: Remove unneeded verify_area call (from domen@coderock.org)

9e66fc56 · Randy Dunlap · David S. Miller · c6f03202 · 9e66fc56
Commit 9e66fc56 authored Sep 25, 2003 by Randy Dunlap Committed by David S. Miller Sep 25, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

net/bluetooth/hci_core.c net/bluetooth/hci_core.c +4 -4

No files found.
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -434,11 +434,11 @@ int hci_inquiry(unsigned long arg)

 	BT_DBG("num_rsp %d", ir.num_rsp);

-	if (!verify_area(VERIFY_WRITE, ptr, sizeof(ir) + 
-			(sizeof(struct inquiry_info) * ir.num_rsp))) {
-		copy_to_user(ptr, &ir, sizeof(ir));
+	if (!copy_to_user(ptr, &ir, sizeof(ir))) {
 		ptr += sizeof(ir);
-	        copy_to_user(ptr, buf, sizeof(struct inquiry_info) * ir.num_rsp);
+	        if (copy_to_user(ptr, buf, sizeof(struct inquiry_info) *
+					ir.num_rsp))
+			err = -EFAULT;
 	} else 
 		err = -EFAULT;