]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
musb_hdrc: Fix compile warnings in musb debug code
authorDirk Behme <dirk.behme@gmail.com>
Fri, 23 Mar 2007 13:58:11 +0000 (09:58 -0400)
committerTony Lindgren <tony@atomide.com>
Fri, 23 Mar 2007 13:58:11 +0000 (09:58 -0400)
Fix compile warnings in musb debug code; it should have been checking
the value of copy_from_user().

Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
drivers/usb/musb/musb_procfs.c

index e5c69d77a9902690a423750aa8a6f2d102649fec..1f7d8e8735d777c313d0129ca8f7df8e465be5c3 100644 (file)
@@ -648,7 +648,9 @@ static int musb_proc_write(struct file *file, const char __user *buffer,
 
        /* MOD_INC_USE_COUNT; */
 
-       copy_from_user(&cmd, buffer, 1);
+       if (unlikely(copy_from_user(&cmd, buffer, 1)))
+               return -EFAULT;
+
        switch (cmd) {
        case 'C':
                if (pBase) {
@@ -722,7 +724,8 @@ static int musb_proc_write(struct file *file, const char __user *buffer,
                                int i = 0, level = 0, sign = 1;
                                int len = min(count - 1, (unsigned long)8);
 
-                               copy_from_user(&digits, &buffer[1], len);
+                               if (copy_from_user(&digits, &buffer[1], len))
+                                       return -EFAULT;
 
                                /* optional sign */
                                if (*p == '-') {