From d6d1e3a718e9a8516959bf59adc611ab8e4fbd14 Mon Sep 17 00:00:00 2001
From: Kirill Korotaev <dev@sw.ru>
Date: Fri, 9 Sep 2005 13:59:48 +0400
Subject: [PATCH] --- yaml --- r: 8275 b: refs/heads/master c:
 d99901d6fdfb4098b9996de89ffbbae890e08288 h: refs/heads/master i:   8273:
 414b6bd0e0ff1f47b5b3f66899c60e3dc0ff1f3f   8271:
 dedcde2c6e16e9b18d5765076cc9e8d560f2e1c9 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/compat_ioctl.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f2e4e06f53dc..0d73cd20916b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35311d6478077f7bfe35c1c653193e658bf32686
+refs/heads/master: d99901d6fdfb4098b9996de89ffbbae890e08288
diff --git a/trunk/fs/compat_ioctl.c b/trunk/fs/compat_ioctl.c
index 155e612635f1..e28a74203f3b 100644
--- a/trunk/fs/compat_ioctl.c
+++ b/trunk/fs/compat_ioctl.c
@@ -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);