Merge branch 'audit.b37' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current

* 'audit.b37' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
  [PATCH] AUDIT_FD_PAIR
  [PATCH] audit config lockdown
  [PATCH] minor update to rule add/delete messages (ver 2)

1 files changed, 7 insertions, 0 deletions

diff --git a/fs/pipe.c b/fs/pipe.c
index 68090e84f589..ebafde7d6aba 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -16,6 +16,7 @@
 #include <linux/uio.h>
 #include <linux/highmem.h>
 #include <linux/pagemap.h>
+#include <linux/audit.h>
 
 #include <asm/uaccess.h>
 #include <asm/ioctls.h>
@@ -985,6 +986,10 @@ int do_pipe(int *fd)
                 goto err_fdr;
         fdw = error;
 
+        error = audit_fd_pair(fdr, fdw);
+        if (error < 0)
+                goto err_fdw;
+
         fd_install(fdr, fr);
         fd_install(fdw, fw);
         fd[0] = fdr;
@@ -992,6 +997,8 @@ int do_pipe(int *fd)
 
         return 0;
 
+ err_fdw:
+        put_unused_fd(fdw);
  err_fdr:
         put_unused_fd(fdr);
  err_read_pipe: