diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2008-05-06 20:42:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-08 10:46:56 -0700 |
| commit | ba719baeabbff5476eeb91c223e6921ba29e1490 (patch) | |
| tree | f3023d34b9ca087412839f6b5937478d49e567ec /fs/pipe.c | |
| parent | c1236d31a1b9fc018b85e15a3e58e3601ddc90ae (diff) | |
| download | linux-3.10-ba719baeabbff5476eeb91c223e6921ba29e1490.tar.gz linux-3.10-ba719baeabbff5476eeb91c223e6921ba29e1490.tar.bz2 linux-3.10-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 'fs/pipe.c')
| -rw-r--r-- | fs/pipe.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/pipe.c b/fs/pipe.c index 3499f9ff631..ec228bc9f88 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -17,6 +17,7 @@ #include <linux/highmem.h> #include <linux/pagemap.h> #include <linux/audit.h> +#include <linux/syscalls.h> #include <asm/uaccess.h> #include <asm/ioctls.h> @@ -1086,8 +1087,11 @@ asmlinkage long __weak sys_pipe(int __user *fildes) error = do_pipe(fd); if (!error) { - if (copy_to_user(fildes, fd, sizeof(fd))) + if (copy_to_user(fildes, fd, sizeof(fd))) { + sys_close(fd[0]); + sys_close(fd[1]); error = -EFAULT; + } } return error; } |