diff mbox

[5/9] Fix leaking of kernel heap addresses in net/

Message ID 1289147517.3090.142.camel@Dan
State Rejected, archived
Delegated to: David Miller
Headers show

Commit Message

Dan Rosenberg Nov. 7, 2010, 4:31 p.m. UTC 
Signed-off-by: Dan Rosenberg <drosenberg@vsecurity.com>




--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

--- linux-2.6.37-rc1.orig/net/key/af_key.c	2010-11-01 07:54:12.000000000 -0400
+++ linux-2.6.37-rc1/net/key/af_key.c	2010-11-07 11:28:13.000000000 -0500
@@ -99,7 +99,8 @@  static void pfkey_sock_destruct(struct s
 	skb_queue_purge(&sk->sk_receive_queue);
 
 	if (!sock_flag(sk, SOCK_DEAD)) {
-		pr_err("Attempt to release alive pfkey socket: %p\n", sk);
+		pr_err("Attempt to release alive pfkey socket: %lu\n",
+			sock_i_ino(sk));
 		return;
 	}
 
@@ -3643,8 +3644,8 @@  static int pfkey_seq_show(struct seq_fil
 	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,
+		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),