summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-05-06 20:42:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-08 10:46:56 -0700
commitba719baeabbff5476eeb91c223e6921ba29e1490 (patch)
treef3023d34b9ca087412839f6b5937478d49e567ec /arch/cris
parentc1236d31a1b9fc018b85e15a3e58e3601ddc90ae (diff)
downloadlinux-ba719baeabbff5476eeb91c223e6921ba29e1490.tar.gz
linux-ba719baeabbff5476eeb91c223e6921ba29e1490.tar.bz2
linux-ba719baeabbff5476eeb91c223e6921ba29e1490.zip
sys_pipe(): fix file descriptor leaks
Remember to close the files if copy_to_user() failed. Spotted by dm.n9107@gmail.com. Signed-off-by: Ulrich Drepper <drepper@redhat.com> Cc: DM <dm.n9107@gmail.com> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/kernel/sys_cris.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/cris/kernel/sys_cris.c b/arch/cris/kernel/sys_cris.c
index 8b9984197edc..d124066e1728 100644
--- a/arch/cris/kernel/sys_cris.c
+++ b/arch/cris/kernel/sys_cris.c
@@ -40,8 +40,11 @@ asmlinkage int sys_pipe(unsigned long __user * fildes)
error = do_pipe(fd);
unlock_kernel();
if (!error) {
- if (copy_to_user(fildes, fd, 2*sizeof(int)))
+ if (copy_to_user(fildes, fd, 2*sizeof(int))) {
+ sys_close(fd[0]);
+ sys_close(fd[1]);
error = -EFAULT;
+ }
}
return error;
}