]> err.no Git - linux-2.6/commitdiff
[PATCH] Lost sockfd_put() in routing_ioctl()
authorKirill Korotaev <dev@sw.ru>
Fri, 9 Sep 2005 09:59:48 +0000 (13:59 +0400)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 9 Sep 2005 21:24:05 +0000 (14:24 -0700)
This patch adds lost sockfd_put() in 32bit compat rounting_ioctl() on
64bit platforms

Signed-Off-By: Kirill Korotaev <dev@sw.ru>
Signed-Off-By: Maxim Giryaev <gem@sw.ru>
Signed-off-By: Linus Torvalds <torvalds@osdl.org>
fs/compat_ioctl.c

index 155e612635f1341e1711f2546c638fa6da9dc0c5..e28a74203f3b1ae42896532a1c5e68bfb6e9c6e1 100644 (file)
@@ -798,13 +798,16 @@ static int routing_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
                r = (void *) &r4;
        }
 
-       if (ret)
-               return -EFAULT;
+       if (ret) {
+               ret = -EFAULT;
+               goto out;
+       }
 
        set_fs (KERNEL_DS);
        ret = sys_ioctl (fd, cmd, (unsigned long) r);
        set_fs (old_fs);
 
+out:
        if (mysock)
                sockfd_put(mysock);