summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-10-03 20:32:17 -0700
committerEric W. Biederman <ebiederm@xmission.com>2012-10-12 13:16:47 -0700
commit1bbb3095a5912be4b9c90397ef2182a5a328865b (patch)
tree058cb0bdd84699fa98cd173f381e711400507fde /net/bluetooth
parentccff9b1db693062b0a9c9070f4304deb47ef215c (diff)
downloadop-kernel-dev-1bbb3095a5912be4b9c90397ef2182a5a328865b.zip
op-kernel-dev-1bbb3095a5912be4b9c90397ef2182a5a328865b.tar.gz
userns: Properly print bluetooth socket uids
With user namespace support enabled building bluetooth generated the warning. net/bluetooth/af_bluetooth.c: In function ‘bt_seq_show’: net/bluetooth/af_bluetooth.c:598:7: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 7 has type ‘kuid_t’ [-Wformat] Convert sock_i_uid from a kuid_t to a uid_t before printing, to avoid this problem. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Cc: Masatake YAMATO <yamato@redhat.com> Cc: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/af_bluetooth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 9d49ee6..ba033f0 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -591,7 +591,7 @@ static int bt_seq_show(struct seq_file *seq, void *v)
atomic_read(&sk->sk_refcnt),
sk_rmem_alloc_get(sk),
sk_wmem_alloc_get(sk),
- sock_i_uid(sk),
+ from_kuid(seq_user_ns(seq), sock_i_uid(sk)),
sock_i_ino(sk),
&src_baswapped,
&dst_baswapped,
OpenPOWER on IntegriCloud