Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes

1 files changed, 4 insertions, 1 deletions

diff --git a/arch/m32r/kernel/sys_m32r.c b/arch/m32r/kernel/sys_m32r.c
index 6d7a80fdad48..319c79720b8a 100644
--- a/arch/m32r/kernel/sys_m32r.c
+++ b/arch/m32r/kernel/sys_m32r.c
@@ -90,8 +90,11 @@ sys_pipe(unsigned long r0, unsigned long r1, unsigned long r2,
 
         error = do_pipe(fd);
         if (!error) {
-                if (copy_to_user((void __user *)r0, fd, 2*sizeof(int)))
+                if (copy_to_user((void __user *)r0, fd, 2*sizeof(int))) {
+                        sys_close(fd[0]);
+                        sys_close(fd[1]);
                         error = -EFAULT;
+                }
         }
         return error;
 }