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)
commit6ed46d1247a595c58b6c04481fa77cf532f45de0
tree16ff8cec378c83d80cb395c152af472fa9fdb3de
parent3c6f3714d6a9e051eb84759e4fa5a2f4a3e730c6
sock_diag: align nlattr properly when needed

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

Fixes: 8f840e47f190 ("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