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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit: (29 commits)
  audit: no leading space in audit_log_d_path prefix
  audit: treat s_id as an untrusted string
  audit: fix signedness bug in audit_log_execve_info()
  audit: comparison on interprocess fields
  audit: implement all object interfield comparisons
  audit: allow interfield comparison between gid and ogid
  audit: complex interfield comparison helper
  audit: allow interfield comparison in audit rules
  Kernel: Audit Support For The ARM Platform
  audit: do not call audit_getname on error
  audit: only allow tasks to set their loginuid if it is -1
  audit: remove task argument to audit_set_loginuid
  audit: allow audit matching on inode gid
  audit: allow matching on obj_uid
  audit: remove audit_finish_fork as it can't be called
  audit: reject entry,always rules
  audit: inline audit_free to simplify the look of generic code
  audit: drop audit_set_macxattr as it doesn't do anything
  audit: inline checks for not needing to collect aux records
  audit: drop some potentially inadvisable likely notations
  ...

Use evil merge to fix up grammar mistakes in Kconfig file.

Bad speling and horrible grammar (and copious swearing) is to be
expected, but let's keep it to commit messages and comments, rather than
expose it to users in config help texts or printouts.

2 files changed, 14 insertions, 19 deletions

diff --git a/fs/namei.c b/fs/namei.c
index c283a1ec008..208c6aa4a98 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -140,21 +140,19 @@ static int do_getname(const char __user *filename, char *page)
 
 static char *getname_flags(const char __user *filename, int flags, int *empty)
 {
-        char *tmp, *result;
-
-        result = ERR_PTR(-ENOMEM);
-        tmp = __getname();
-        if (tmp)  {
-                int retval = do_getname(filename, tmp);
-
-                result = tmp;
-                if (retval < 0) {
-                        if (retval == -ENOENT && empty)
-                                *empty = 1;
-                        if (retval != -ENOENT || !(flags & LOOKUP_EMPTY)) {
-                                __putname(tmp);
-                                result = ERR_PTR(retval);
-                        }
+        char *result = __getname();
+        int retval;
+
+        if (!result)
+                return ERR_PTR(-ENOMEM);
+
+        retval = do_getname(filename, result);
+        if (retval < 0) {
+                if (retval == -ENOENT && empty)
+                        *empty = 1;
+                if (retval != -ENOENT || !(flags & LOOKUP_EMPTY)) {
+                        __putname(result);
+                        return ERR_PTR(retval);
                 }
         }
         audit_getname(result);
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 662ddf2ec4f..9cde9edf9c4 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1132,9 +1132,6 @@ static ssize_t proc_loginuid_write(struct file * file, const char __user * buf,
         ssize_t length;
         uid_t loginuid;
 
-        if (!capable(CAP_AUDIT_CONTROL))
-                return -EPERM;
-
         rcu_read_lock();
         if (current != pid_task(proc_pid(inode), PIDTYPE_PID)) {
                 rcu_read_unlock();
@@ -1163,7 +1160,7 @@ static ssize_t proc_loginuid_write(struct file * file, const char __user * buf,
                 goto out_free_page;
 
         }
-        length = audit_set_loginuid(current, loginuid);
+        length = audit_set_loginuid(loginuid);
         if (likely(length == 0))
                 length = count;