---

yaml --- r: 8275 b: refs/heads/master c: d99901d h: refs/heads/master i: 8273: 414b6bd 8271: dedcde2 v: v3
git-mirror · Sep 9, 2005 · d6d1e3a · d6d1e3a
1 parent 44ae00a
commit d6d1e3a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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);