summaryrefslogtreecommitdiffstats
path: root/net/unix/diag.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@parallels.com>2011-12-26 20:08:47 +0100
committerDavid S. Miller <davem@davemloft.net>2011-12-26 20:08:47 +0100
commit3b0723c12e825e26aa5fc0c6970108425824b51d (patch)
tree23ae96d0b284a5676aa826e23c338a6292642d01 /net/unix/diag.c
parentMerge branch 'nf-next' of git://1984.lsi.us.es/net-next (diff)
downloadlinux-3b0723c12e825e26aa5fc0c6970108425824b51d.tar.xz
linux-3b0723c12e825e26aa5fc0c6970108425824b51d.zip
unix_diag: Fix incoming connections nla length
The NLA_PUT macro should accept the actual attribute length, not the amount of elements in array :( Signed-off-by: Pavel Emelyanov <xemul@parallels.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix/diag.c')
-rw-r--r--net/unix/diag.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/unix/diag.c b/net/unix/diag.c
index 91d57828499c..39e44c98176a 100644
--- a/net/unix/diag.c
+++ b/net/unix/diag.c
@@ -72,7 +72,8 @@ static int sk_diag_dump_icons(struct sock *sk, struct sk_buff *nlskb)
if (sk->sk_state == TCP_LISTEN) {
spin_lock(&sk->sk_receive_queue.lock);
- buf = UNIX_DIAG_PUT(nlskb, UNIX_DIAG_ICONS, sk->sk_receive_queue.qlen);
+ buf = UNIX_DIAG_PUT(nlskb, UNIX_DIAG_ICONS,
+ sk->sk_receive_queue.qlen * sizeof(u32));
i = 0;
skb_queue_walk(&sk->sk_receive_queue, skb) {
struct sock *req, *peer;