diff options
| author | Pedro Falcato <[email protected]> | 2025-04-30 15:45:41 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2025-05-03 01:28:21 +0000 |
| commit | a2f6476ed18a3e96e65d47a757d5755421ae8f91 (patch) | |
| tree | 26b121524eff9753ce12239bacf3361e155e2977 | |
| parent | Merge branch 'net-stmmac-replace-speed_mode_2500-method' (diff) | |
| download | kernel-a2f6476ed18a3e96e65d47a757d5755421ae8f91.tar.gz kernel-a2f6476ed18a3e96e65d47a757d5755421ae8f91.zip | |
mptcp: Align mptcp_inet6_sk with other protocols
Ever since commit f5f80e32de12 ("ipv6: remove hard coded limitation on
ipv6_pinfo") that protocols stopped using the old "obj_size -
sizeof(struct ipv6_pinfo)" way of grabbing ipv6_pinfo, that severely
restricted struct layout and caused fun, hard to see issues.
However, mptcp_inet6_sk wasn't fixed (unlike tcp_inet6_sk). Do so.
The non-cloned sockets already do the right thing using
ipv6_pinfo_offset + the generic IPv6 code.
Signed-off-by: Pedro Falcato <[email protected]>
Reviewed-by: Matthieu Baerts (NGI0) <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
| -rw-r--r-- | net/mptcp/protocol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 26ffa06c21e8..c4fd558307f2 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3142,9 +3142,9 @@ static int mptcp_disconnect(struct sock *sk, int flags) #if IS_ENABLED(CONFIG_MPTCP_IPV6) static struct ipv6_pinfo *mptcp_inet6_sk(const struct sock *sk) { - unsigned int offset = sizeof(struct mptcp6_sock) - sizeof(struct ipv6_pinfo); + struct mptcp6_sock *msk6 = container_of(mptcp_sk(sk), struct mptcp6_sock, msk); - return (struct ipv6_pinfo *)(((u8 *)sk) + offset); + return &msk6->np; } static void mptcp_copy_ip6_options(struct sock *newsk, const struct sock *sk) |