As part of the removal of the variably-sized sockaddr for kernel
internals, replace struct sockaddr with sockaddr_inet in the sctp_addr
union.

No binary changes; the union size remains unchanged due to sockaddr_inet
matching the size of sockaddr_in6.

Signed-off-by: Kees Cook <k...@kernel.org>
---
Cc: Marcelo Ricardo Leitner <marcelo.leit...@gmail.com>
Cc: Xin Long <lucien....@gmail.com>
Cc: "David S. Miller" <da...@davemloft.net>
Cc: Eric Dumazet <eduma...@google.com>
Cc: Jakub Kicinski <k...@kernel.org>
Cc: Paolo Abeni <pab...@redhat.com>
Cc: Simon Horman <ho...@kernel.org>
Cc: <linux-s...@vger.kernel.org>
Cc: <net...@vger.kernel.org>
---
 include/net/sctp/structs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 1ad7ce71d0a7..8a540ad9b509 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -51,9 +51,9 @@
  * We should wean ourselves off this.
  */
 union sctp_addr {
+       struct sockaddr_inet sa;        /* Large enough for both address 
families */
        struct sockaddr_in v4;
        struct sockaddr_in6 v6;
-       struct sockaddr sa;
 };
 
 /* Forward declarations for data structures. */
-- 
2.34.1


Reply via email to