From: David S. Miller <davem@davemloft.net>
Date: Fri, 24 Aug 2012 22:54:37 +0000 (-0400)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm... 
X-Git-Tag: v3.7-rc1~145^2~276
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6acb384807406c1a6ad3ddc91191f7658e63b7a;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'for-next' of git://git./linux/kernel/git/ebiederm/user-namespace

This is an initial merge in of Eric Biederman's work to start adding
user namespace support to the networking.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

e6acb384807406c1a6ad3ddc91191f7658e63b7a
diff --cc net/ipv4/tcp_ipv4.c
index 1e15c5b,642be8a..36f02f9
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@@ -2393,10 -2382,10 +2393,10 @@@ void tcp_proc_unregister(struct net *ne
  EXPORT_SYMBOL(tcp_proc_unregister);
  
  static void get_openreq4(const struct sock *sk, const struct request_sock *req,
- 			 struct seq_file *f, int i, int uid, int *len)
+ 			 struct seq_file *f, int i, kuid_t uid, int *len)
  {
  	const struct inet_request_sock *ireq = inet_rsk(req);
 -	int ttd = req->expires - jiffies;
 +	long delta = req->expires - jiffies;
  
  	seq_printf(f, "%4d: %08X:%04X %08X:%04X"
  		" %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %pK%n",
@@@ -2408,9 -2397,9 +2408,9 @@@
  		TCP_SYN_RECV,
  		0, 0, /* could print option size, but that is af dependent. */
  		1,    /* timers active (only the expire timer) */
 -		jiffies_to_clock_t(ttd),
 +		jiffies_delta_to_clock_t(delta),
  		req->retrans,
- 		uid,
+ 		from_kuid_munged(seq_user_ns(f), uid),
  		0,  /* non standard timer */
  		0, /* open_requests have no inode */
  		atomic_read(&sk->sk_refcnt),
@@@ -2459,9 -2448,9 +2459,9 @@@ static void get_tcp4_sock(struct sock *
  		tp->write_seq - tp->snd_una,
  		rx_queue,
  		timer_active,
 -		jiffies_to_clock_t(timer_expires - jiffies),
 +		jiffies_delta_to_clock_t(timer_expires - jiffies),
  		icsk->icsk_retransmits,
- 		sock_i_uid(sk),
+ 		from_kuid_munged(seq_user_ns(f), sock_i_uid(sk)),
  		icsk->icsk_probes_out,
  		sock_i_ino(sk),
  		atomic_read(&sk->sk_refcnt), sk,
diff --cc net/ipv6/tcp_ipv6.c
index cd49de3,4b5b335..f99b81d
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@@ -1900,9 -1875,9 +1900,9 @@@ static void get_tcp6_sock(struct seq_fi
  		   tp->write_seq-tp->snd_una,
  		   (sp->sk_state == TCP_LISTEN) ? sp->sk_ack_backlog : (tp->rcv_nxt - tp->copied_seq),
  		   timer_active,
 -		   jiffies_to_clock_t(timer_expires - jiffies),
 +		   jiffies_delta_to_clock_t(timer_expires - jiffies),
  		   icsk->icsk_retransmits,
- 		   sock_i_uid(sp),
+ 		   from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
  		   icsk->icsk_probes_out,
  		   sock_i_ino(sp),
  		   atomic_read(&sp->sk_refcnt), sp,