diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-03 22:04:05 -0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-03 22:04:05 -0800 |
| commit | ca89bc248e2fac44d6374a48b8d38b068c7a1bdf (patch) | |
| tree | 0c10af2a5f22a1ad0283023d403022ce6b84ebc4 /net/unix/diag.c | |
| parent | 9645083ca5ef365b7b750cf219bb20b61bb925f8 (diff) | |
| parent | 7b5bfb82882b9b1c8423ce0ed6852ca3762d967a (diff) | |
Merge remote-tracking branch 'asoc/fix/ak4642' into asoc-linus
Diffstat (limited to 'net/unix/diag.c')
| -rw-r--r-- | net/unix/diag.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/unix/diag.c b/net/unix/diag.c index d591091603b..86fa0f3b2ca 100644 --- a/net/unix/diag.c +++ b/net/unix/diag.c @@ -124,6 +124,7 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, struct unix_diag_r rep->udiag_family = AF_UNIX; rep->udiag_type = sk->sk_type; rep->udiag_state = sk->sk_state; + rep->pad = 0; rep->udiag_ino = sk_ino; sock_diag_save_cookie(sk, rep->udiag_cookie); |