1 files changed, 51 insertions, 13 deletions

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 298897559ca4..628c7ac590a0 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -170,6 +170,11 @@ struct audit_aux_data_sockaddr {
         char                    a[0];
 };
 
+struct audit_aux_data_fd_pair {
+        struct  audit_aux_data d;
+        int     fd[2];
+};
+
 struct audit_aux_data_path {
         struct audit_aux_data   d;
         struct dentry           *dentry;
@@ -734,28 +739,26 @@ static inline void audit_free_context(struct audit_context *context)
 void audit_log_task_context(struct audit_buffer *ab)
 {
         char *ctx = NULL;
-        ssize_t len = 0;
+        unsigned len;
+        int error;
+        u32 sid;
+
+        selinux_get_task_sid(current, &sid);
+        if (!sid)
+                return;
 
-        len = security_getprocattr(current, "current", NULL, 0);
-        if (len < 0) {
-                if (len != -EINVAL)
+        error = selinux_sid_to_string(sid, &ctx, &len);
+        if (error) {
+                if (error != -EINVAL)
                         goto error_path;
                 return;
         }
 
-        ctx = kmalloc(len, GFP_KERNEL);
-        if (!ctx)
-                goto error_path;
-
-        len = security_getprocattr(current, "current", ctx, len);
-        if (len < 0 )
-                goto error_path;
-
         audit_log_format(ab, " subj=%s", ctx);
+        kfree(ctx);
         return;
 
 error_path:
-        kfree(ctx);
         audit_panic("error in audit_log_task_context");
         return;
 }
@@ -961,6 +964,11 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts
                         audit_log_d_path(ab, "path=", axi->dentry, axi->mnt);
                         break; }
 
+                case AUDIT_FD_PAIR: {
+                        struct audit_aux_data_fd_pair *axs = (void *)aux;
+                        audit_log_format(ab, "fd0=%d fd1=%d", axs->fd[0], axs->fd[1]);
+                        break; }
+
                 }
                 audit_log_end(ab);
         }
@@ -1815,6 +1823,36 @@ int audit_socketcall(int nargs, unsigned long *args)
 }
 
 /**
+ * __audit_fd_pair - record audit data for pipe and socketpair
+ * @fd1: the first file descriptor
+ * @fd2: the second file descriptor
+ *
+ * Returns 0 for success or NULL context or < 0 on error.
+ */
+int __audit_fd_pair(int fd1, int fd2)
+{
+        struct audit_context *context = current->audit_context;
+        struct audit_aux_data_fd_pair *ax;
+
+        if (likely(!context)) {
+                return 0;
+        }
+
+        ax = kmalloc(sizeof(*ax), GFP_KERNEL);
+        if (!ax) {
+                return -ENOMEM;
+        }
+
+        ax->fd[0] = fd1;
+        ax->fd[1] = fd2;
+
+        ax->d.type = AUDIT_FD_PAIR;
+        ax->d.next = context->aux;
+        context->aux = (void *)ax;
+        return 0;
+}
+
+/**
  * audit_sockaddr - record audit data for sys_bind, sys_connect, sys_sendto
  * @len: data length in user space
  * @a: data address in kernel space