From: David S. Miller <davem@davemloft.net>
Date: Mon, 26 Dec 2011 19:41:55 +0000 (-0500)
Subject: unix: If we happen to find peer NULL when diag dumping, write zero.
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e09e9d189bc2d31dc365a3d846a09086317350b6;p=openwrt%2Fstaging%2Fblogic.git

unix: If we happen to find peer NULL when diag dumping, write zero.

Otherwise we leave uninitialized kernel memory in there.

Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/unix/diag.c b/net/unix/diag.c
index 39e44c98176a..c5bdbcb1c30b 100644
--- a/net/unix/diag.c
+++ b/net/unix/diag.c
@@ -86,8 +86,7 @@ static int sk_diag_dump_icons(struct sock *sk, struct sk_buff *nlskb)
 			 */
 			unix_state_lock_nested(req);
 			peer = unix_sk(req)->peer;
-			if (peer)
-				buf[i++] = sock_i_ino(peer);
+			buf[i++] = (peer ? sock_i_ino(peer) : 0);
 			unix_state_unlock(req);
 		}
 		spin_unlock(&sk->sk_receive_queue.lock);