github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

BACKPORT: Don't show empty tag stats for unprivileged uids

Browse Source 
BUG: 27577101
BUG: 27532522
hxw: fix cts com.android.cts.appsecurity.AppSecurityTests#testAppFailAccessPrivateData fail

Change-Id: Id6f7933b966ecad0b4d1249ea8ade86b97477545
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Signed-off-by: HaoXiaowei <hxw@rock-chips.com>
This commit is contained in:
Mohamad Ayyash 2016-05-11 13:18:35 -07:00 committed by Huang, Tao
parent a1d20be406
commit a4b64eeade
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/netfilter/xt_qtaguid.c
View File

@ -1946,7 +1946,7 @@ static int qtaguid_ctrl_proc_show(struct seq_file *m, void *v)
);
f_count = atomic_long_read(
&sock_tag_entry->socket->file->f_count);
seq_printf(m, "sock=%p tag=0x%llx (uid=%u) pid=%u "
seq_printf(m, "sock=%pK tag=0x%llx (uid=%u) pid=%u "
"f_count=%lu\n",
sock_tag_entry->sk,
sock_tag_entry->tag, uid,
@ -2548,8 +2548,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",