Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

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

diff --git a/arch/mips/kernel/irixinv.c b/arch/mips/kernel/irixinv.c
index 60aa98cd17912460748c35a62f0005ddf6381f4a..de8584f623113556166d7756cc06b97ecd424eae 100644 (file)
--- a/arch/mips/kernel/irixinv.c
+++ b/arch/mips/kernel/irixinv.c
@@ -30,10 +30,10 @@ 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 (!access_ok(VERIFY_WRITE, userbuf, size))
@@ -41,7 +41,8 @@ int dump_inventory_to_user (void *userbuf, int size)
 
        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);