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

Pull user namespace changes from Eric Biederman:
 "This is a mostly modest set of changes to enable basic user namespace
  support.  This allows the code to code to compile with user namespaces
  enabled and removes the assumption there is only the initial user
  namespace.  Everything is converted except for the most complex of the
  filesystems: autofs4, 9p, afs, ceph, cifs, coda, fuse, gfs2, ncpfs,
  nfs, ocfs2 and xfs as those patches need a bit more review.

  The strategy is to push kuid_t and kgid_t values are far down into
  subsystems and filesystems as reasonable.  Leaving the make_kuid and
  from_kuid operations to happen at the edge of userspace, as the values
  come off the disk, and as the values come in from the network.
  Letting compile type incompatible compile errors (present when user
  namespaces are enabled) guide me to find the issues.

  The most tricky areas have been the places where we had an implicit
  union of uid and gid values and were storing them in an unsigned int.
  Those places were converted into explicit unions.  I made certain to
  handle those places with simple trivial patches.

  Out of that work I discovered we have generic interfaces for storing
  quota by projid.  I had never heard of the project identifiers before.
  Adding full user namespace support for project identifiers accounts
  for most of the code size growth in my git tree.

  Ultimately there will be work to relax privlige checks from
  "capable(FOO)" to "ns_capable(user_ns, FOO)" where it is safe allowing
  root in a user names to do those things that today we only forbid to
  non-root users because it will confuse suid root applications.

  While I was pushing kuid_t and kgid_t changes deep into the audit code
  I made a few other cleanups.  I capitalized on the fact we process
  netlink messages in the context of the message sender.  I removed
  usage of NETLINK_CRED, and started directly using current->tty.

  Some of these patches have also made it into maintainer trees, with no
  problems from identical code from different trees showing up in
  linux-next.

  After reading through all of this code I feel like I might be able to
  win a game of kernel trivial pursuit."

Fix up some fairly trivial conflicts in netfilter uid/git logging code.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: (107 commits)
  userns: Convert the ufs filesystem to use kuid/kgid where appropriate
  userns: Convert the udf filesystem to use kuid/kgid where appropriate
  userns: Convert ubifs to use kuid/kgid
  userns: Convert squashfs to use kuid/kgid where appropriate
  userns: Convert reiserfs to use kuid and kgid where appropriate
  userns: Convert jfs to use kuid/kgid where appropriate
  userns: Convert jffs2 to use kuid and kgid where appropriate
  userns: Convert hpfs to use kuid and kgid where appropriate
  userns: Convert btrfs to use kuid/kgid where appropriate
  userns: Convert bfs to use kuid/kgid where appropriate
  userns: Convert affs to use kuid/kgid wherwe appropriate
  userns: On alpha modify linux_to_osf_stat to use convert from kuids and kgids
  userns: On ia64 deal with current_uid and current_gid being kuid and kgid
  userns: On ppc convert current_uid from a kuid before printing.
  userns: Convert s390 getting uid and gid system calls to use kuid and kgid
  userns: Convert s390 hypfs to use kuid and kgid where appropriate
  userns: Convert binder ipc to use kuids
  userns: Teach security_path_chown to take kuids and kgids
  userns: Add user namespace support to IMA
  userns: Convert EVM to deal with kuids and kgids in it's hmac computation
  ...

diff --cc arch/alpha/kernel/osf_sys.c
Simple merge

diff --cc arch/s390/kernel/compat_linux.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc drivers/staging/android/binder.c
Simple merge

diff --cc drivers/usb/gadget/f_fs.c
Simple merge

diff --cc drivers/usb/gadget/inode.c
Simple merge

diff --cc fs/affs/super.c
Simple merge

diff --cc fs/btrfs/delayed-inode.c
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge

diff --cc fs/btrfs/ioctl.c
Simple merge

diff --cc fs/debugfs/inode.c
Simple merge

diff --cc fs/ecryptfs/main.c
Simple merge

diff --cc fs/exofs/inode.c
Simple merge

diff --cc fs/ext3/super.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/gfs2/quota.c
Simple merge

diff --cc fs/hfs/inode.c
Simple merge

diff --cc fs/logfs/inode.c
Simple merge

diff --cc fs/logfs/readwrite.c
Simple merge

diff --cc fs/namei.c
Simple merge

diff --cc fs/open.c
Simple merge

diff --cc fs/quota/dquot.c
Simple merge

diff --cc fs/reiserfs/inode.c
Simple merge

diff --cc fs/ubifs/super.c
Simple merge

diff --cc fs/udf/inode.c
Simple merge

diff --cc fs/udf/super.c
Simple merge

diff --cc fs/xattr.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc include/linux/security.h
Simple merge

diff --cc include/linux/tty.h
Simple merge

diff --cc include/net/netns/ipv4.h
index eb24dbccd81e81aff5fac76c8792e93df66e7bb6,3516dc0cc61548190ece8b1b9e8407779eeb20a8..69e50c789d9663ec46f9cc743f8720e2ec1e927a
--- 1/include/net/netns/ipv4.h
--- 2/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@@ -62,9 -63,10 +63,9 @@@ struct netns_ipv4 
        int sysctl_icmp_ratemask;
        int sysctl_icmp_errors_use_inbound_ifaddr;
  
-       unsigned int sysctl_ping_group_range[2];
+       kgid_t sysctl_ping_group_range[2];
        long sysctl_tcp_mem[3];
  
 -      atomic_t rt_genid;
        atomic_t dev_addr_genid;
  
  #ifdef CONFIG_IP_MROUTE

diff --cc include/net/sock.h
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc include/net/xfrm.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/pid_namespace.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc kernel/trace/trace.h
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/scm.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/ipv4/raw.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv4/udp.c
Simple merge

diff --cc net/ipv6/raw.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc net/ipv6/udp.c
Simple merge

diff --cc net/netfilter/nfnetlink_log.c
index 5cfb5bedb2b8e8f2fa44ed936a7cab265b5878e6,4142aac17c3cee9c382b942f54d8fc411c3d0d69..8cfc401e197e83092b12d4c9b6395889e4752239
--- 1/net/netfilter/nfnetlink_log.c
--- 2/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@@ -500,14 -501,16 +502,16 @@@ __build_packet_message(struct nfulnl_in
        }
  
        /* UID */
 -      if (skb->sk) {
 -              read_lock_bh(&skb->sk->sk_callback_lock);
 -              if (skb->sk->sk_socket && skb->sk->sk_socket->file) {
 -                      struct file *file = skb->sk->sk_socket->file;
 -                      __be32 uid = htonl(from_kuid_munged(inst->peer_user_ns,
 -                                                          file->f_cred->fsuid));
 -                      __be32 gid = htonl(from_kgid_munged(inst->peer_user_ns,
 -                                                          file->f_cred->fsgid));
 -                      /* need to unlock here since NLA_PUT may goto */
 -                      read_unlock_bh(&skb->sk->sk_callback_lock);
 +      sk = skb->sk;
 +      if (sk && sk->sk_state != TCP_TIME_WAIT) {
 +              read_lock_bh(&sk->sk_callback_lock);
 +              if (sk->sk_socket && sk->sk_socket->file) {
 +                      struct file *file = sk->sk_socket->file;
-                       __be32 uid = htonl(file->f_cred->fsuid);
-                       __be32 gid = htonl(file->f_cred->fsgid);
++                      const struct cred *cred = file->f_cred;
++                      struct user_namespace *user_ns = inst->peer_user_ns;
++                      __be32 uid = htonl(from_kuid_munged(user_ns, cred->fsuid));
++                      __be32 gid = htonl(from_kgid_munged(user_ns, cred->fsgid));
 +                      read_unlock_bh(&sk->sk_callback_lock);
                        if (nla_put_be32(inst->skb, NFULA_UID, uid) ||
                            nla_put_be32(inst->skb, NFULA_GID, gid))
                                goto nla_put_failure;

diff --cc net/netfilter/xt_LOG.c
index 91e9af4d1f42c3baef9af1261c9464c70cd1bac0,02a2bf49dcbd13d307d4f0128fe092ca51e68eef..fa40096940a1712be7ac0c517ea5f1d7af4dfd56
--- 1/net/netfilter/xt_LOG.c
--- 2/net/netfilter/xt_LOG.c
+++ b/net/netfilter/xt_LOG.c
@@@ -145,19 -145,6 +145,21 @@@ static int dump_tcp_header(struct sbuf
        return 0;
  }
  
-       if (sk->sk_socket && sk->sk_socket->file)
 +static void dump_sk_uid_gid(struct sbuff *m, struct sock *sk)
 +{
 +      if (!sk || sk->sk_state == TCP_TIME_WAIT)
 +              return;
 +
 +      read_lock_bh(&sk->sk_callback_lock);
-                       sk->sk_socket->file->f_cred->fsuid,
-                       sk->sk_socket->file->f_cred->fsgid);
++      if (sk->sk_socket && sk->sk_socket->file) {
++              const struct cred *cred = sk->sk_socket->file->f_cred;
 +              sb_add(m, "UID=%u GID=%u ",
++                      from_kuid_munged(&init_user_ns, cred->fsuid),
++                      from_kgid_munged(&init_user_ns, cred->fsgid));
++      }
 +      read_unlock_bh(&sk->sk_callback_lock);
 +}
 +
  /* One level of recursion won't kill us */
  static void dump_ipv4_packet(struct sbuff *m,
                        const struct nf_loginfo *info,

diff --cc net/netlink/af_netlink.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge

diff --cc net/sched/cls_cgroup.c
Simple merge

diff --cc net/xfrm/xfrm_policy.c
Simple merge

diff --cc net/xfrm/xfrm_state.c
Simple merge

diff --cc net/xfrm/xfrm_user.c
Simple merge

diff --cc security/keys/key.c
Simple merge

diff --cc security/keys/keyctl.c
Simple merge