diff options
author | Ulrich Drepper <drepper@redhat.com> | 2008-05-06 23:42:38 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-08 13:46:56 -0400 |
commit | ba719baeabbff5476eeb91c223e6921ba29e1490 (patch) | |
tree | f3023d34b9ca087412839f6b5937478d49e567ec /arch/cris/kernel | |
parent | c1236d31a1b9fc018b85e15a3e58e3601ddc90ae (diff) |
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/kernel')
-rw-r--r-- | arch/cris/kernel/sys_cris.c | 5 |
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) | |||
40 | error = do_pipe(fd); | 40 | error = do_pipe(fd); |
41 | unlock_kernel(); | 41 | unlock_kernel(); |
42 | if (!error) { | 42 | if (!error) { |
43 | if (copy_to_user(fildes, fd, 2*sizeof(int))) | 43 | if (copy_to_user(fildes, fd, 2*sizeof(int))) { |
44 | sys_close(fd[0]); | ||
45 | sys_close(fd[1]); | ||
44 | error = -EFAULT; | 46 | error = -EFAULT; |
47 | } | ||
45 | } | 48 | } |
46 | return error; | 49 | return error; |
47 | } | 50 | } |