Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / mips / kernel / irixinv.c

diff --git a/arch/mips/kernel/irixinv.c b/arch/mips/kernel/irixinv.c
index eea2582..de8584f 100644 (file)
--- a/arch/mips/kernel/irixinv.c
+++ b/arch/mips/kernel/irixinv.c
@@ -6,10 +6,8 @@
  * Miguel de Icaza, 1997.
  */
 #include <linux/mm.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <asm/uaccess.h>
 #include <asm/inventory.h>
+#include <asm/uaccess.h>
 
 #define MAX_INVENTORY 50
 int inventory_items = 0;
@@ -32,24 +30,25 @@ void add_to_inventory (int class, int type, int controller, int unit, int state)
        inventory_items++;
 }
 
-int dump_inventory_to_user (void *userbuf, int size)
+int dump_inventory_to_user (void __user *userbuf, int size)
 {
        inventory_t *inv  = &inventory [0];
-       inventory_t *user = userbuf;
+       inventory_t __user *user = userbuf;
        int v;
 
-       if ((v = verify_area (VERIFY_WRITE, userbuf, size)))
-               return v;
+       if (!access_ok(VERIFY_WRITE, userbuf, size))
+               return -EFAULT;
 
        for (v = 0; v < inventory_items; v++){
                inv = &inventory [v];
-               copy_to_user (user, inv, sizeof (inventory_t));
+               if (copy_to_user (user, inv, sizeof (inventory_t)))
+                       return -EFAULT;
                user++;
        }
        return inventory_items * sizeof (inventory_t);
 }
 
-static int __init init_inventory(void)
+int __init init_inventory(void)
 {
        /*
         * gross hack while we put the right bits all over the kernel
@@ -77,5 +76,3 @@ static int __init init_inventory(void)
 
        return 0;
 }
-
-module_init(init_inventory);