Skip to contentSkip to conversation

PATCH: fd leak if pipe() is called with an invalid address.

PATCH Changli Gao 3 participants 5 messages Jul 2, 2009 – Jul 10, 2009

lore
Share & tools
lore
#0 lore raw

fd leak if pipe() is called with an invalid address.

Though -EFAULT is returned, the file descriptors opened by pipe() call are left open.

----

 x86/ia32/sys_ia32.c     |    5 ++++-
 xtensa/kernel/syscall.c |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
x86/ia32/sys_ia32.c renamed from x86/ia32/sys_ia32.c.orig +4 -1
@@ -197,8 +197,11 @@
 	retval = do_pipe_flags(fds, 0);
 	if (retval)
 		goto out;
-	if (copy_to_user(fd, fds, sizeof(fds)))
+	if (copy_to_user(fd, fds, sizeof(fds))) {
+		sys_close(fd[0]);
+		sys_close(fd[1]);
 		retval = -EFAULT;
+	}
 out:
 	return retval;
 }
xtensa/kernel/syscall.c renamed from xtensa/kernel/syscall.c.orig +4 -1
@@ -51,8 +51,11 @@
 
 	error = do_pipe_flags(fd, 0);
 	if (!error) {
-		if (copy_to_user(userfds, fd, 2 * sizeof(int)))
+		if (copy_to_user(userfds, fd, 2 * sizeof(int))) {
+			sys_close(fd[0]);
+			sys_close(fd[1]);
 			error = -EFAULT;
+		}
 	}
 	return error;
 }
Reviewed-by
#1 lore raw
Quoted 4 lines · Changli Gao

fd leak if pipe() is called with an invalid address.

Though -EFAULT is returned, the file descriptors opened by pipe() call are left open.

Looks reasonable.

Quoted 2 lines
Quoted 43 lines

----

x86/ia32/sys_ia32.c     |    5 ++++-
xtensa/kernel/syscall.c |    5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
x86/ia32/sys_ia32.c renamed from x86/ia32/sys_ia32.c.orig +4 -1
@@ -197,8 +197,11 @@
 	retval = do_pipe_flags(fds, 0);
 	if (retval)
 		goto out;
-	if (copy_to_user(fd, fds, sizeof(fds)))
+	if (copy_to_user(fd, fds, sizeof(fds))) {
+		sys_close(fd[0]);
+		sys_close(fd[1]);
 		retval = -EFAULT;
+	}

out:

	return retval;
}
xtensa/kernel/syscall.c renamed from xtensa/kernel/syscall.c.orig +4 -2
@@ -51,8 +51,11 @@
 
 	error = do_pipe_flags(fd, 0);
 	if (!error) {
-		if (copy_to_user(userfds, fd, 2 * sizeof(int)))
+		if (copy_to_user(userfds, fd, 2 * sizeof(int))) {
+			sys_close(fd[0]);
+			sys_close(fd[1]);
 			error = -EFAULT;
+		}
 	}
 	return error;
 }
 
--

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#2 lore raw
In reply to Changli Gao

x86/ia32/sys_ia32.c

Quoted 15 lines · Changli Gao

fd leak if pipe() is called with an invalid address.

Though -EFAULT is returned, the file descriptors opened by pipe() call are left open.

----

x86/ia32/sys_ia32.c     |    5 ++++-
xtensa/kernel/syscall.c |    5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
x86/ia32/sys_ia32.c renamed from x86/ia32/sys_ia32.c.orig +0 -0

This patch is not correctly made... You need to make the patch in the _upper_ directory of the top source code tree (if you don't use git), so that we can apply it with 'patch -p1 < XXX'.

Probably this is the reason why Linus still doesn't merge it.

Can you re-make it and resend with my Acked-by?

Thanks.

#3 lore raw
Quoted 14 lines · Amerigo Wang
Quoted 13 lines · Changli Gao

fd leak if pipe() is called with an invalid address.

Though -EFAULT is returned, the file descriptors opened by pipe() call are left open.

----

x86/ia32/sys_ia32.c     |    5 ++++-
xtensa/kernel/syscall.c |    5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
Quoted 8 lines

x86/ia32/sys_ia32.c

Quoted 2 lines
x86/ia32/sys_ia32.c renamed from x86/ia32/sys_ia32.c.orig +0 -0

This patch is not correctly made... You need to make the patch in the _upper_ directory of the top source code tree (if you don't use git), so that we can apply it with 'patch -p1 < XXX'.

Probably this is the reason why Linus still doesn't merge it.

No, the main reason I haven't merged it is that I don't think the patch is worth it.

If you give a bad area to pipe(), there's no point in closign the file descriptors. It's a user-space bug. You got your file descriptors, you just don't know what the hell they are, because your program is sh*t. There's no point in the kernel trying to clean up, because the cleaned-up state is not any better.

Linus

#4 lore raw
Quoted 18 lines · Linus Torvalds
Quoted 14 lines · Amerigo Wang
Quoted 13 lines · Changli Gao

fd leak if pipe() is called with an invalid address.

Though -EFAULT is returned, the file descriptors opened by pipe() call are left open.

----

x86/ia32/sys_ia32.c     |    5 ++++-
xtensa/kernel/syscall.c |    5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
Quoted 8 lines
Quoted 8 lines

x86/ia32/sys_ia32.c

Quoted 2 lines
x86/ia32/sys_ia32.c renamed from x86/ia32/sys_ia32.c.orig +0 -0

This patch is not correctly made... You need to make the patch in the _upper_ directory of the top source code tree (if you don't use git), so that we can apply it with 'patch -p1 < XXX'.

Probably this is the reason why Linus still doesn't merge it.

Hi, Linus.

Quoted 9 lines

No, the main reason I haven't merged it is that I don't think the patch is worth it.

If you give a bad area to pipe(), there's no point in closign the file descriptors. It's a user-space bug. You got your file descriptors, you just don't know what the hell they are, because your program is sh*t. There's no point in the kernel trying to clean up, because the cleaned-up state is not any better.

I totally agree that it is a user-space program's fault if it hits this, but that doesn't mean we don't need to fix it in kernel, because logically we are leaking fd's in that path.

Please also check sys_pipe2() in fs/pipe.c.

Thank you.