Patched in Tegra support.

1 files changed, 14 insertions, 18 deletions

diff --git a/drivers/tty/tty_audit.c b/drivers/tty/tty_audit.c
index 6953dc82850..7c586692062 100644
--- a/drivers/tty/tty_audit.c
+++ b/drivers/tty/tty_audit.c
@@ -23,7 +23,7 @@ struct tty_audit_buf {
 };
 
 static struct tty_audit_buf *tty_audit_buf_alloc(int major, int minor,
-                                                 unsigned icanon)
+                                                 int icanon)
 {
         struct tty_audit_buf *buf;
 
@@ -61,7 +61,7 @@ static void tty_audit_buf_put(struct tty_audit_buf *buf)
 }
 
 static void tty_audit_log(const char *description, struct task_struct *tsk,
-                          kuid_t loginuid, unsigned sessionid, int major,
+                          uid_t loginuid, unsigned sessionid, int major,
                           int minor, unsigned char *data, size_t size)
 {
         struct audit_buffer *ab;
@@ -69,14 +69,11 @@ static void tty_audit_log(const char *description, struct task_struct *tsk,
         ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_TTY);
         if (ab) {
                 char name[sizeof(tsk->comm)];
-                kuid_t uid = task_uid(tsk);
+                uid_t uid = task_uid(tsk);
 
                 audit_log_format(ab, "%s pid=%u uid=%u auid=%u ses=%u "
                                  "major=%d minor=%d comm=", description,
-                                 tsk->pid,
-                                 from_kuid(&init_user_ns, uid),
-                                 from_kuid(&init_user_ns, loginuid),
-                                 sessionid,
+                                 tsk->pid, uid, loginuid, sessionid,
                                  major, minor);
                 get_task_comm(name, tsk);
                 audit_log_untrustedstring(ab, name);
@@ -92,7 +89,7 @@ static void tty_audit_log(const char *description, struct task_struct *tsk,
  *      Generate an audit message from the contents of @buf, which is owned by
  *      @tsk with @loginuid.  @buf->mutex must be locked.
  */
-static void tty_audit_buf_push(struct task_struct *tsk, kuid_t loginuid,
+static void tty_audit_buf_push(struct task_struct *tsk, uid_t loginuid,
                                unsigned int sessionid,
                                struct tty_audit_buf *buf)
 {
@@ -115,7 +112,7 @@ static void tty_audit_buf_push(struct task_struct *tsk, kuid_t loginuid,
  */
 static void tty_audit_buf_push_current(struct tty_audit_buf *buf)
 {
-        kuid_t auid = audit_get_loginuid(current);
+        uid_t auid = audit_get_loginuid(current);
         unsigned int sessionid = audit_get_sessionid(current);
         tty_audit_buf_push(current, auid, sessionid, buf);
 }
@@ -182,7 +179,7 @@ void tty_audit_tiocsti(struct tty_struct *tty, char ch)
         }
 
         if (should_audit && audit_enabled) {
-                kuid_t auid;
+                uid_t auid;
                 unsigned int sessionid;
 
                 auid = audit_get_loginuid(current);
@@ -202,7 +199,7 @@ void tty_audit_tiocsti(struct tty_struct *tty, char ch)
  * reference to the tty audit buffer if available.
  * Flush the buffer or return an appropriate error code.
  */
-int tty_audit_push_task(struct task_struct *tsk, kuid_t loginuid, u32 sessionid)
+int tty_audit_push_task(struct task_struct *tsk, uid_t loginuid, u32 sessionid)
 {
         struct tty_audit_buf *buf = ERR_PTR(-EPERM);
         unsigned long flags;
@@ -239,8 +236,7 @@ int tty_audit_push_task(struct task_struct *tsk, kuid_t loginuid, u32 sessionid)
  *      if TTY auditing is disabled or out of memory.  Otherwise, return a new
  *      reference to the buffer.
  */
-static struct tty_audit_buf *tty_audit_buf_get(struct tty_struct *tty,
-                unsigned icanon)
+static struct tty_audit_buf *tty_audit_buf_get(struct tty_struct *tty)
 {
         struct tty_audit_buf *buf, *buf2;
 
@@ -258,7 +254,7 @@ static struct tty_audit_buf *tty_audit_buf_get(struct tty_struct *tty,
 
         buf2 = tty_audit_buf_alloc(tty->driver->major,
                                    tty->driver->minor_start + tty->index,
-                                   icanon);
+                                   tty->icanon);
         if (buf2 == NULL) {
                 audit_log_lost("out of memory in TTY auditing");
                 return NULL;
@@ -288,7 +284,7 @@ static struct tty_audit_buf *tty_audit_buf_get(struct tty_struct *tty,
  *      Audit @data of @size from @tty, if necessary.
  */
 void tty_audit_add_data(struct tty_struct *tty, unsigned char *data,
-                        size_t size, unsigned icanon)
+                        size_t size)
 {
         struct tty_audit_buf *buf;
         int major, minor;
@@ -300,7 +296,7 @@ void tty_audit_add_data(struct tty_struct *tty, unsigned char *data,
             && tty->driver->subtype == PTY_TYPE_MASTER)
                 return;
 
-        buf = tty_audit_buf_get(tty, icanon);
+        buf = tty_audit_buf_get(tty);
         if (!buf)
                 return;
 
@@ -308,11 +304,11 @@ void tty_audit_add_data(struct tty_struct *tty, unsigned char *data,
         major = tty->driver->major;
         minor = tty->driver->minor_start + tty->index;
         if (buf->major != major || buf->minor != minor
-            || buf->icanon != icanon) {
+            || buf->icanon != tty->icanon) {
                 tty_audit_buf_push_current(buf);
                 buf->major = major;
                 buf->minor = minor;
-                buf->icanon = icanon;
+                buf->icanon = tty->icanon;
         }
         do {
                 size_t run;