]> git.hungrycats.org Git - linux/commitdiff
[PATCH] sound_oss_sb_audio.c copy_from_user buglets
authorMikael Pettersson <mikpe@csd.uu.se>
Mon, 15 Jul 2002 06:03:08 +0000 (23:03 -0700)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Mon, 15 Jul 2002 06:03:08 +0000 (23:03 -0700)
 Fallout of copy_from_user() cleanups. sb16_copy_from_user()
 returns void not int, so it can't return -EFAULT.

sound/oss/sb_audio.c

index 6b0a3f7275ee340fcea3f8c56c9870e57fd87f01..dda11e473696f51c97bea33fc18ac0ab59535f52 100644 (file)
@@ -851,7 +851,7 @@ sb16_copy_from_user(int dev,
        {
                if (copy_from_user(localbuf + localoffs,
                                   userbuf + useroffs, len))
-                       return -EFAULT;
+                       return;
                *used = len;
                *returned = len;
        }
@@ -874,7 +874,7 @@ sb16_copy_from_user(int dev,
                        if (copy_from_user(lbuf16,
                                           userbuf + useroffs + (p << 1),
                                           locallen << 1))
-                               return -EFAULT;
+                               return;
                        for (i = 0; i < locallen; i++)
                        {
                                buf8[p+i] = ~((lbuf16[i] >> 8) & 0xff) ^ 0x80;
@@ -904,7 +904,7 @@ sb16_copy_from_user(int dev,
                        if (copy_from_user(lbuf8,
                                           userbuf+useroffs + p,
                                           locallen))
-                               return -EFAULT;
+                               return;
                        for (i = 0; i < locallen; i++)
                        {
                                buf16[p+i] = (~lbuf8[i] ^ 0x80) << 8;