net: sctp: Fix IPv6 ancestor_size calc in sctp_copy_descendant
authorHenry Ptasinski <hptasinski@google.com>
Sat, 19 Sep 2020 00:12:11 +0000 (00:12 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 26 Sep 2020 16:05:24 +0000 (18:05 +0200)
commit5bda4b3ec1c9faf236b30d5892f5467c55300414
tree8718ab9f72a7f98d4cc5ada433d5b6e2a06a4d9a
parentbd6df0266e31c399268d795d649fb079ce5079b7
net: sctp: Fix IPv6 ancestor_size calc in sctp_copy_descendant

[ Upstream commit fe81d9f6182d1160e625894eecb3d7ff0222cac5 ]

When calculating ancestor_size with IPv6 enabled, simply using
sizeof(struct ipv6_pinfo) doesn't account for extra bytes needed for
alignment in the struct sctp6_sock. On x86, there aren't any extra
bytes, but on ARM the ipv6_pinfo structure is aligned on an 8-byte
boundary so there were 4 pad bytes that were omitted from the
ancestor_size calculation.  This would lead to corruption of the
pd_lobby pointers, causing an oops when trying to free the sctp
structure on socket close.

Fixes: 636d25d557d1 ("sctp: not copy sctp_sock pd_lobby in sctp_copy_descendant")
Signed-off-by: Henry Ptasinski <hptasinski@google.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
include/net/sctp/structs.h
net/sctp/socket.c