summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-10-31 13:04:32 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-10-31 13:04:31 -0700
commit9b370b398806e1b5765692f16fe49122dde93010 (patch)
treebad46eb3fb6f04511fca3b1291674019b493706a
parentc1818afef3a0cf20354aa50985ed48405ac3592e (diff)
parent760d2085003d3cbe53a86ec6c86d636b4d92fde2 (diff)
Merge "Don't show empty tag stats for unprivileged uids"
-rw-r--r--net/netfilter/xt_qtaguid.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/xt_qtaguid.c b/net/netfilter/xt_qtaguid.c
index dca5cacc51f0..ececa65868ef 100644
--- a/net/netfilter/xt_qtaguid.c
+++ b/net/netfilter/xt_qtaguid.c
@@ -2536,8 +2536,7 @@ static int pp_stats_line(struct seq_file *m, struct tag_stat *ts_entry,
uid_t stat_uid = get_uid_from_tag(tag);
struct proc_print_info *ppi = m->private;
/* Detailed tags are not available to everybody */
- if (get_atag_from_tag(tag) && !can_read_other_uid_stats(
- make_kuid(&init_user_ns,stat_uid))) {
+ if (!can_read_other_uid_stats(make_kuid(&init_user_ns,stat_uid))) {
CT_DEBUG("qtaguid: stats line: "
"%s 0x%llx %u: insufficient priv "
"from pid=%u tgid=%u uid=%u stats.gid=%u\n",