Merge tag 'for-v3.7' of git://git.infradead.org/battery-2.6

[karo-tx-linux.git] / net / netfilter / xt_LOG.c

diff --git a/net/netfilter/xt_LOG.c b/net/netfilter/xt_LOG.c
index 91e9af4d1f42c3baef9af1261c9464c70cd1bac0..fa40096940a1712be7ac0c517ea5f1d7af4dfd56 100644 (file)
--- a/net/netfilter/xt_LOG.c
+++ b/net/netfilter/xt_LOG.c
@@ -151,10 +151,12 @@ static void dump_sk_uid_gid(struct sbuff *m, struct sock *sk)
                return;
 
        read_lock_bh(&sk->sk_callback_lock);
-       if (sk->sk_socket && sk->sk_socket->file)
+       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 ",
-                       sk->sk_socket->file->f_cred->fsuid,
-                       sk->sk_socket->file->f_cred->fsgid);
+                       from_kuid_munged(&init_user_ns, cred->fsuid),
+                       from_kgid_munged(&init_user_ns, cred->fsgid));
+       }
        read_unlock_bh(&sk->sk_callback_lock);
 }