Patched in Tegra support.

1 files changed, 12 insertions, 26 deletions

diff --git a/security/tomoyo/audit.c b/security/tomoyo/audit.c
index c1b00375c9a..5dbb1f7617c 100644
--- a/security/tomoyo/audit.c
+++ b/security/tomoyo/audit.c
@@ -112,7 +112,7 @@ out:
  *
  * Returns file type string.
  */
-static inline const char *tomoyo_filetype(const umode_t mode)
+static inline const char *tomoyo_filetype(const mode_t mode)
 {
         switch (mode & S_IFMT) {
         case S_IFREG:
@@ -168,14 +168,9 @@ static char *tomoyo_print_header(struct tomoyo_request_info *r)
                        stamp.day, stamp.hour, stamp.min, stamp.sec, r->profile,
                        tomoyo_mode[r->mode], tomoyo_yesno(r->granted), gpid,
                        tomoyo_sys_getpid(), tomoyo_sys_getppid(),
-                       from_kuid(&init_user_ns, current_uid()),
-                       from_kgid(&init_user_ns, current_gid()),
-                       from_kuid(&init_user_ns, current_euid()),
-                       from_kgid(&init_user_ns, current_egid()),
-                       from_kuid(&init_user_ns, current_suid()),
-                       from_kgid(&init_user_ns, current_sgid()),
-                       from_kuid(&init_user_ns, current_fsuid()),
-                       from_kgid(&init_user_ns, current_fsgid()));
+                       current_uid(), current_gid(), current_euid(),
+                       current_egid(), current_suid(), current_sgid(),
+                       current_fsuid(), current_fsgid());
         if (!obj)
                 goto no_obj_info;
         if (!obj->validate_done) {
@@ -185,7 +180,7 @@ static char *tomoyo_print_header(struct tomoyo_request_info *r)
         for (i = 0; i < TOMOYO_MAX_PATH_STAT; i++) {
                 struct tomoyo_mini_stat *stat;
                 unsigned int dev;
-                umode_t mode;
+                mode_t mode;
                 if (!obj->stat_valid[i])
                         continue;
                 stat = &obj->stat[i];
@@ -196,19 +191,15 @@ static char *tomoyo_print_header(struct tomoyo_request_info *r)
                                         tomoyo_buffer_len - 1 - pos,
                                         " path%u.parent={ uid=%u gid=%u "
                                         "ino=%lu perm=0%o }", (i >> 1) + 1,
-                                        from_kuid(&init_user_ns, stat->uid),
-                                        from_kgid(&init_user_ns, stat->gid),
-                                        (unsigned long)stat->ino,
-                                        stat->mode & S_IALLUGO);
+                                        stat->uid, stat->gid, (unsigned long)
+                                        stat->ino, stat->mode & S_IALLUGO);
                         continue;
                 }
                 pos += snprintf(buffer + pos, tomoyo_buffer_len - 1 - pos,
                                 " path%u={ uid=%u gid=%u ino=%lu major=%u"
                                 " minor=%u perm=0%o type=%s", (i >> 1) + 1,
-                                from_kuid(&init_user_ns, stat->uid),
-                                from_kgid(&init_user_ns, stat->gid),
-                                (unsigned long)stat->ino,
-                                MAJOR(dev), MINOR(dev),
+                                stat->uid, stat->gid, (unsigned long)
+                                stat->ino, MAJOR(dev), MINOR(dev),
                                 mode & S_IALLUGO, tomoyo_filetype(mode));
                 if (S_ISCHR(mode) || S_ISBLK(mode)) {
                         dev = stat->rdev;
@@ -322,7 +313,6 @@ static unsigned int tomoyo_log_count;
  */
 static bool tomoyo_get_audit(const struct tomoyo_policy_namespace *ns,
                              const u8 profile, const u8 index,
-                             const struct tomoyo_acl_info *matched_acl,
                              const bool is_granted)
 {
         u8 mode;
@@ -334,9 +324,6 @@ static bool tomoyo_get_audit(const struct tomoyo_policy_namespace *ns,
         p = tomoyo_profile(ns, profile);
         if (tomoyo_log_count >= p->pref[TOMOYO_PREF_MAX_AUDIT_LOG])
                 return false;
-        if (is_granted && matched_acl && matched_acl->cond &&
-            matched_acl->cond->grant_log != TOMOYO_GRANTLOG_AUTO)
-                return matched_acl->cond->grant_log == TOMOYO_GRANTLOG_YES;
         mode = p->config[index];
         if (mode == TOMOYO_CONFIG_USE_DEFAULT)
                 mode = p->config[category];
@@ -363,8 +350,7 @@ void tomoyo_write_log2(struct tomoyo_request_info *r, int len, const char *fmt,
         char *buf;
         struct tomoyo_log *entry;
         bool quota_exceeded = false;
-        if (!tomoyo_get_audit(r->domain->ns, r->profile, r->type,
-                              r->matched_acl, r->granted))
+        if (!tomoyo_get_audit(r->domain->ns, r->profile, r->type, r->granted))
                 goto out;
         buf = tomoyo_init_log(r, len, fmt, args);
         if (!buf)
@@ -455,11 +441,11 @@ void tomoyo_read_log(struct tomoyo_io_buffer *head)
  * tomoyo_poll_log - Wait for an audit log.
  *
  * @file: Pointer to "struct file".
- * @wait: Pointer to "poll_table". Maybe NULL.
+ * @wait: Pointer to "poll_table".
  *
  * Returns POLLIN | POLLRDNORM when ready to read an audit log.
  */
-unsigned int tomoyo_poll_log(struct file *file, poll_table *wait)
+int tomoyo_poll_log(struct file *file, poll_table *wait)
 {
         if (tomoyo_log_count)
                 return POLLIN | POLLRDNORM;