netdev
[Top] [All Lists]

[PATCH] janitor: bluetooth: remove unneeded verify_area call

To: netdev@xxxxxxxxxxx, davem@xxxxxxxxxx
Subject: [PATCH] janitor: bluetooth: remove unneeded verify_area call
From: "Randy.Dunlap" <rddunlap@xxxxxxxx>
Date: Thu, 25 Sep 2003 21:56:37 -0700
Cc: maxk@xxxxxxxxxxxx
Organization: OSDL
Sender: netdev-bounce@xxxxxxxxxxx
Hi,
Please apply to 2.6.0-test5-current.

Thanks,
--
~Randy


From: Domen Puncer <domen@xxxxxxxxxxxx>

 linux-260-t5bk12-kj-rddunlap/net/bluetooth/hci_core.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff -puN net/bluetooth/hci_core.c~net_bluetooth_hcicore_verify 
net/bluetooth/hci_core.c
--- linux-260-t5bk12-kj/net/bluetooth/hci_core.c~net_bluetooth_hcicore_verify   
2003-09-25 16:01:20.000000000 -0700
+++ linux-260-t5bk12-kj-rddunlap/net/bluetooth/hci_core.c       2003-09-25 
16:01:20.000000000 -0700
@@ -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;
 

_

<Prev in Thread] Current Thread [Next in Thread>