[<prev] [next>] [day] [month] [year] [list]
Date: Thu, 11 Nov 2010 20:07:09 -0500
From: Dan Rosenberg <drosenberg@...curity.com>
To: "David S. Miller" <davem@...emloft.net>,
Oliver Hartkopp <socketcan@...tkopp.net>,
Alexey Kuznetsov <kuznet@....inr.ac.ru>,
Urs Thuermann <urs.thuermann@...kswagen.de>,
Hideaki YOSHIFUJI <yoshfuji@...ux-ipv6.org>,
Patrick McHardy <kaber@...sh.net>,
James Morris <jmorris@...ei.org>,
Remi Denis-Courmont <remi.denis-courmont@...ia.com>,
"Pekka Savola (ipv6)" <pekkas@...core.fi>,
Sridhar Samudrala <sri@...ibm.com>,
Vlad Yasevich <vladislav.yasevich@...com>,
Tejun Heo <tj@...nel.org>,
Eric Dumazet <eric.dumazet@...il.com>,
Li Zefan <lizf@...fujitsu.com>, Joe Perches <joe@...ches.com>,
Stephen Hemminger <shemminger@...tta.com>,
Jamal Hadi Salim <hadi@...atatu.com>,
"Eric W. Biederman" <ebiederm@...ssion.com>,
Alexey Dobriyan <adobriyan@...il.com>,
Jiri Pirko <jpirko@...hat.com>,
Johannes Berg <johannes.berg@...el.com>,
Daniel Lezcano <daniel.lezcano@...e.fr>,
Pavel Emelyanov <xemul@...nvz.org>,
socketcan-core@...ts.berlios.de, netdev@...r.kernel.org,
linux-sctp@...r.kernel.org
Subject: [PATCH 5/10] Fix leaking of kernel heap addresses in net/
diff --git a/net/key/af_key.c b/net/key/af_key.c
index d87c22d..977481a 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -3643,14 +3643,25 @@ static int pfkey_seq_show(struct seq_file *f, void *v)
if (v == SEQ_START_TOKEN)
seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n");
else
- seq_printf(f ,"%p %-6d %-6u %-6u %-6u %-6lu\n",
- s,
- atomic_read(&s->sk_refcnt),
- sk_rmem_alloc_get(s),
- sk_wmem_alloc_get(s),
- sock_i_uid(s),
- sock_i_ino(s)
- );
+ /* Only expose kernel addresses to privileged readers */
+ if (capable(CAP_NET_ADMIN))
+ seq_printf(f, "%p %-6d %-6u %-6u %-6u %-6lu\n",
+ s,
+ atomic_read(&s->sk_refcnt),
+ sk_rmem_alloc_get(s),
+ sk_wmem_alloc_get(s),
+ sock_i_uid(s),
+ sock_i_ino(s)
+ );
+ else
+ seq_printf(f, "%d %-6d %-6u %-6u %-6u %-6lu\n",
+ 0,
+ atomic_read(&s->sk_refcnt),
+ sk_rmem_alloc_get(s),
+ sk_wmem_alloc_get(s),
+ sock_i_uid(s),
+ sock_i_ino(s)
+ );
return 0;
}
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists