Merge branch 'stable-4.6' of git://git.infradead.org/users/pcmoore/audit

[deliverable/linux.git] / kernel / audit.c

diff --git a/kernel/audit.c b/kernel/audit.c
index 8fa7533bf10681857aff4825e21ee5d3090f4d3e..678c3f000191be66aed944e764209ef5c2924b98 100644 (file)
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -938,7 +938,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                if (err == 1) { /* match or error */
                        err = 0;
                        if (msg_type == AUDIT_USER_TTY) {
-                               err = tty_audit_push_current();
+                               err = tty_audit_push();
                                if (err)
                                        break;
                        }
@@ -1048,20 +1048,19 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                break;
        case AUDIT_TTY_GET: {
                struct audit_tty_status s;
-               struct task_struct *tsk = current;
+               unsigned int t;
 
-               spin_lock(&tsk->sighand->siglock);
-               s.enabled = tsk->signal->audit_tty;
-               s.log_passwd = tsk->signal->audit_tty_log_passwd;
-               spin_unlock(&tsk->sighand->siglock);
+               t = READ_ONCE(current->signal->audit_tty);
+               s.enabled = t & AUDIT_TTY_ENABLE;
+               s.log_passwd = !!(t & AUDIT_TTY_LOG_PASSWD);
 
                audit_send_reply(skb, seq, AUDIT_TTY_GET, 0, 0, &s, sizeof(s));
                break;
        }
        case AUDIT_TTY_SET: {
                struct audit_tty_status s, old;
-               struct task_struct *tsk = current;
                struct audit_buffer     *ab;
+               unsigned int t;
 
                memset(&s, 0, sizeof(s));
                /* guard against past and future API changes */
@@ -1071,14 +1070,14 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                    (s.log_passwd != 0 && s.log_passwd != 1))
                        err = -EINVAL;
 
-               spin_lock(&tsk->sighand->siglock);
-               old.enabled = tsk->signal->audit_tty;
-               old.log_passwd = tsk->signal->audit_tty_log_passwd;
-               if (!err) {
-                       tsk->signal->audit_tty = s.enabled;
-                       tsk->signal->audit_tty_log_passwd = s.log_passwd;
+               if (err)
+                       t = READ_ONCE(current->signal->audit_tty);
+               else {
+                       t = s.enabled | (-s.log_passwd & AUDIT_TTY_LOG_PASSWD);
+                       t = xchg(&current->signal->audit_tty, t);
                }
-               spin_unlock(&tsk->sighand->siglock);
+               old.enabled = t & AUDIT_TTY_ENABLE;
+               old.log_passwd = !!(t & AUDIT_TTY_LOG_PASSWD);
 
                audit_log_common_recv_msg(&ab, AUDIT_CONFIG_CHANGE);
                audit_log_format(ab, " op=tty_set old-enabled=%d new-enabled=%d"
@@ -1737,7 +1736,7 @@ static inline int audit_copy_fcaps(struct audit_names *name,
 
 /* Copy inode data into an audit_names. */
 void audit_copy_inode(struct audit_names *name, const struct dentry *dentry,
-                     const struct inode *inode)
+                     struct inode *inode)
 {
        name->ino   = inode->i_ino;
        name->dev   = inode->i_sb->s_dev;