]> git.baikalelectronics.ru Git - kernel.git/commit
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)
committerDavid S. Miller <davem@davemloft.net>
Sun, 20 Sep 2020 21:15:12 +0000 (14:15 -0700)
commitfd1dc89b79b62164b68210a4b9ccbac2c938c16b
tree4ea97ca4097a651dc3e032b95363b44261f0375a
parente1059ad5321ae43faabfde5db295ee34e369c080
net: sctp: Fix IPv6 ancestor_size calc in sctp_copy_descendant

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: 478d8bc4f7c8 ("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>
include/net/sctp/structs.h
net/sctp/socket.c