diff options
| author | John Stultz <john.stultz@linaro.org> | 2014-03-03 16:18:43 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2014-03-03 16:18:43 -0800 |
| commit | 3e822390c4c3d4cbc6319f17080532ecdc07b360 (patch) | |
| tree | f3c4739f87599695960185bdcca5cd9ef4d26c97 | |
| parent | 619b4c82136ce061da219e88700c08eff002b5cd (diff) | |
tcp: uid/kuid build fixes for AOSP bitstracking-linaro-android-3.14-llct-20140304.0
Found a another uid/kuid build issue. This tries to naievly fix it
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -rw-r--r-- | net/ipv4/tcp.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 04699bac02b2..46f18f95ddc9 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1287,7 +1287,8 @@ out: release_sock(sk); if (copied + copied_syn) - uid_stat_tcp_snd(current_uid(), copied + copied_syn); + uid_stat_tcp_snd(from_kuid(&init_user_ns, current_uid()), + copied + copied_syn); return copied + copied_syn; do_fault: @@ -1592,7 +1593,8 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc, if (copied > 0) { tcp_recv_skb(sk, seq, &offset); tcp_cleanup_rbuf(sk, copied); - uid_stat_tcp_rcv(current_uid(), copied); + uid_stat_tcp_rcv(from_kuid(&init_user_ns, current_uid()), + copied); } return copied; } @@ -2003,7 +2005,8 @@ skip_copy: release_sock(sk); if (copied > 0) - uid_stat_tcp_rcv(current_uid(), copied); + uid_stat_tcp_rcv(from_kuid(&init_user_ns, current_uid()), + copied); return copied; out: @@ -2013,7 +2016,8 @@ out: recv_urg: err = tcp_recv_urg(sk, msg, len, flags); if (err > 0) - uid_stat_tcp_rcv(current_uid(), err); + uid_stat_tcp_rcv(from_kuid(&init_user_ns, current_uid()), + err); goto out; recv_sndq: |