linux-next: manual merge of the userns tree with the tree

[Stephen Rothwell]

Hi Eric,

Today's linux-next merge of the userns tree got a conflict in
kernel/audit.c between commit 15e473046cb6 ("netlink: Rename pid to
portid to avoid confusion") from the net-next tree and commits
8aa14b64981e ("audit: Simply AUDIT_TTY_SET and AUDIT_TTY_GET") and
017143fecb33 ("audit: Remove the unused uid parameter from
audit_receive_filter") from the userns tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc kernel/audit.c
index e0cf64a,511488a..0000000
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@@ -782,8 -769,8 +769,8 @@@ static int audit_receive_msg(struct sk_
                }
                /* fallthrough */
        case AUDIT_LIST:
 -              err = audit_receive_filter(msg_type, NETLINK_CB(skb).pid,
 +              err = audit_receive_filter(msg_type, NETLINK_CB(skb).portid,
-                                          uid, seq, data, nlmsg_len(nlh),
+                                          seq, data, nlmsg_len(nlh),
                                           loginuid, sessionid, sid);
                break;
        case AUDIT_ADD_RULE:
@@@ -801,8 -788,8 +788,8 @@@
                }
                /* fallthrough */
        case AUDIT_LIST_RULES:
 -              err = audit_receive_filter(msg_type, NETLINK_CB(skb).pid,
 +              err = audit_receive_filter(msg_type, NETLINK_CB(skb).portid,
-                                          uid, seq, data, nlmsg_len(nlh),
+                                          seq, data, nlmsg_len(nlh),
                                           loginuid, sessionid, sid);
                break;
        case AUDIT_TRIM:
@@@ -878,21 -865,14 +865,14 @@@
                break;
        case AUDIT_TTY_GET: {
                struct audit_tty_status s;
-               struct task_struct *tsk;
-               unsigned long flags;
- 
-               rcu_read_lock();
-               tsk = find_task_by_vpid(pid);
-               if (tsk && lock_task_sighand(tsk, &flags)) {
-                       s.enabled = tsk->signal->audit_tty != 0;
-                       unlock_task_sighand(tsk, &flags);
-               } else
-                       err = -ESRCH;
-               rcu_read_unlock();
- 
-               if (!err)
-                       audit_send_reply(NETLINK_CB(skb).portid, seq,
-                                        AUDIT_TTY_GET, 0, 0, &s, sizeof(s));
+               struct task_struct *tsk = current;
+ 
+               spin_lock_irq(&tsk->sighand->siglock);
+               s.enabled = tsk->signal->audit_tty != 0;
+               spin_unlock_irq(&tsk->sighand->siglock);
+ 
 -              audit_send_reply(NETLINK_CB(skb).pid, seq,
++              audit_send_reply(NETLINK_CB(skb).portid, seq,
+                                AUDIT_TTY_GET, 0, 0, &s, sizeof(s));
                break;
        }
        case AUDIT_TTY_SET: {

pgpqQLZXyJ2xd.pgp
Description: PGP signature