]> git.baikalelectronics.ru Git - kernel.git/commit
sock_diag: align nlattr properly when needed
authorNicolas Dichtel <nicolas.dichtel@6wind.com>
Tue, 26 Apr 2016 08:06:14 +0000 (10:06 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 26 Apr 2016 16:00:48 +0000 (12:00 -0400)
commite6f4540db106067fe6af91ffd30a1a8a4608e34e
tree16ff8cec378c83d80cb395c152af472fa9fdb3de
parent5c8ebc3a52fb074788329b0cf1aa50091be1ab46
sock_diag: align nlattr properly when needed

I also fix the value of INET_DIAG_MAX. It's wrong since commit 6360b73a23ca
which is only in net-next right now, thus I didn't make a separate patch.

Fixes: 6360b73a23ca ("sctp: add the sctp_diag.c file")
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/uapi/linux/inet_diag.h
net/core/sock_diag.c
net/ipv4/inet_diag.c
net/sctp/sctp_diag.c