Add support for v1 of ADD_ADDR option
Subsystems (3)
Peter Krystad
cover Add support for v1 of ADD_ADDR option
Support parsing and writing the new option format, with hmac generation and validation.
Support for echoing ADD_ADDR still to come.
Peter Krystad (2):
mptcp: Re-factor mptcp_crypto_hmac_sha()
mptcp: Make v1 changes for ADD_ADDR and RM_ADDR options
include/linux/tcp.h | 22 +++--- include/net/mptcp.h | 2 + net/mptcp/crypto.c | 14 ++-- net/mptcp/options.c | 180 ++++++++++++++++++++++++++++++++++--------- net/mptcp/protocol.h | 20 +++-- net/mptcp/subflow.c | 19 ++++- 6 files changed, 194 insertions(+), 63 deletions(-)
Signature · 1 line
2.17.2
Peter Krystad
PATCH 1/2 mptcp: Re-factor mptcp_crypto_hmac_sha()
Allow it to take variable-length messages so that v1 ADD_ADDR option processing may use it.
squashto: Add ADD_ADDR handling
--- net/mptcp/crypto.c | 14 ++++++++------ net/mptcp/protocol.h | 3 +-- net/mptcp/subflow.c | 19 +++++++++++++++---- 3 files changed, 24 insertions(+), 12 deletions(-)
net/mptcp/crypto.c +8 -6
@@ -44,8 +44,7 @@ void mptcp_crypto_key_sha(u64 key, u32 *token, u64 *idsn) *idsn =be64_to_cpu (*((__be64 *)&mptcp_hashed_key[6 ])); } -void mptcp_crypto_hmac_sha (u64 key1,u64 key2,u32 nonce1,u32 nonce2, -void *hmac) +void mptcp_crypto_hmac_sha (u64 key1,u64 key2,u8 *msg,int len,void *hmac) {u8 input[SHA256_BLOCK_SIZE +SHA256_DIGEST_SIZE ];__be32 mptcp_hashed_key[SHA256_DIGEST_WORDS ];
@@ -65,11 +64,10 @@ void mptcp_crypto_hmac_sha(u64 key1, u64 key2, u32 nonce1, u32 nonce2,for (i =0 ; i <8 ; i++) input[i +8 ] ^= key2be[i]; -put_unaligned_be32 (nonce1, &input[SHA256_BLOCK_SIZE ]); -put_unaligned_be32 (nonce2, &input[SHA256_BLOCK_SIZE +4 ]); +memcpy (&input[SHA256_BLOCK_SIZE ], msg, len);sha256_init (&state); -sha256_update (&state, input,SHA256_BLOCK_SIZE +8 ); +sha256_update (&state, input,SHA256_BLOCK_SIZE + len);/* emit sha256(K1 || msg) on the second input block, so we can * reuse 'input' for the last hashing
@@ -125,6 +123,7 @@ static int __init test_mptcp_crypto(void)char hmac[20 ], hmac_hex[41 ];u32 nonce1, nonce2;u64 key1, key2; +u8 msg[8 ];int i, j;for (i =0 ; i <ARRAY_SIZE (tests); ++i) {
@@ -134,7 +133,10 @@ static int __init test_mptcp_crypto(void) nonce1 =be32_to_cpu (*((__be32 *)&tests[i].msg[0 ])); nonce2 =be32_to_cpu (*((__be32 *)&tests[i].msg[4 ])); -mptcp_crypto_hmac_sha (key1, key2, nonce1, nonce2, hmac); +put_unaligned_be32 (nonce1, &msg[0 ]); +put_unaligned_be32 (nonce2, &msg[4 ]); + +mptcp_crypto_hmac_sha (key1, key2, msg,8 , hmac);for (j =0 ; j <20 ; ++j)sprintf (&hmac_hex[j <<1 ],"%02x" , hmac[j] &0xff ); hmac_hex[40 ] =0 ;
net/mptcp/protocol.h +1 -2
@@ -339,8 +339,7 @@ static inline void mptcp_crypto_key_gen_sha(u64 *key, u32 *token, u64 *idsn)mptcp_crypto_key_sha (*key, token, idsn); } -void mptcp_crypto_hmac_sha (u64 key1,u64 key2,u32 nonce1,u32 nonce2, -void *hash_out); +void mptcp_crypto_hmac_sha (u64 key1,u64 key2,u8 *msg,int len,void *hmac);void mptcp_pm_init (void );void mptcp_pm_new_connection (struct mptcp_sock *msk,int server_side);
net/mptcp/subflow.c +15 -4
@@ -61,6 +61,17 @@ static void subflow_req_destructor(struct request_sock *req) tcp_request_sock_ops.destructor (req); } +static void subflow_generate_hmac (u64 key1,u64 key2,u32 nonce1,u32 nonce2, +void *hmac) +{ +u8 msg[8 ]; + +put_unaligned_be32 (nonce1, &msg[0 ]); +put_unaligned_be32 (nonce2, &msg[4 ]); + +mptcp_crypto_hmac_sha (key1, key2, msg,8 , (u32 *)hmac); +} +/* validate received token and create truncated hmac and nonce for SYN-ACK */ static bool subflow_token_join_request (struct request_sock *req,const struct sk_buff *skb)
@@ -82,7 +93,7 @@ static bool subflow_token_join_request(struct request_sock *req,get_random_bytes (&subflow_req->local_nonce,sizeof (u32)); -mptcp_crypto_hmac_sha (msk->local_key, msk->remote_key, +subflow_generate_hmac (msk->local_key, msk->remote_key, subflow_req->local_nonce, subflow_req->remote_nonce, (u32 *)hmac);
@@ -180,7 +191,7 @@ static bool subflow_thmac_valid(struct mptcp_subflow_context *subflow)u8 hmac[MPTCPOPT_HMAC_LEN ];u64 thmac; -mptcp_crypto_hmac_sha (subflow->remote_key, subflow->local_key, +subflow_generate_hmac (subflow->remote_key, subflow->local_key, subflow->remote_nonce, subflow->local_nonce, (u32 *)hmac);
@@ -225,7 +236,7 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) goto do_reset; } -mptcp_crypto_hmac_sha (subflow->local_key, subflow->remote_key, +subflow_generate_hmac (subflow->local_key, subflow->remote_key, subflow->local_nonce, subflow->remote_nonce, (u32 *)subflow->hmac);
@@ -305,7 +316,7 @@ static bool subflow_hmac_valid(const struct request_sock *req,if (!msk)return false; -mptcp_crypto_hmac_sha (msk->remote_key, msk->local_key, +subflow_generate_hmac (msk->remote_key, msk->local_key, subflow_req->remote_nonce, subflow_req->local_nonce, (u32 *)hmac);
Signature · 1 line
2.17.2
Mat Martineau
[MPTCP] Re: [PATCH 1/2] mptcp: Re-factor mptcp_crypto_hmac_sha()
Quoted 27 lines · Peter Krystad
Allow it to take variable-length messages so that v1
ADD_ADDRoption processing may use it.squashto: Add
ADD_ADDRhandlingSigned-off-by Peter Krystad <peter.krystad(a)linux.intel.com>---
net/mptcp/crypto.c | 14 ++++++++------ net/mptcp/protocol.h | 3 +-- net/mptcp/subflow.c | 19 +++++++++++++++---- 3 files changed, 24 insertions(+), 12 deletions(-)net/mptcp/crypto.c +1
-2@@ -44,8 +44,7 @@ void mptcp_crypto_key_sha(u64 key, u32 *token, u64 *idsn) *idsn =be64_to_cpu (*((__be64 *)&mptcp_hashed_key[6 ])); } -void mptcp_crypto_hmac_sha (u64 key1,u64 key2,u32 nonce1,u32 nonce2, -void *hmac) +void mptcp_crypto_hmac_sha (u64 key1,u64 key2,u8 *msg,int len,void *hmac) {u8 input[SHA256_BLOCK_SIZE +SHA256_DIGEST_SIZE ];__be32 mptcp_hashed_key[SHA256_DIGEST_WORDS ];
net/mptcp/crypto.c void mptcp_crypto_hmac_sha(u64 key1, u64 key2, u32 nonce1, u32 nonce2, · line 67
Quoted 6 lines
net/mptcp/crypto.c +1
-2@@ -65,11 +64,10 @@ void mptcp_crypto_hmac_sha(u64 key1, u64 key2, u32 nonce1, u32 nonce2,for (i =0 ; i <8 ; i++) input[i +8 ] ^= key2be[i]; -put_unaligned_be32 (nonce1, &input[SHA256_BLOCK_SIZE ]); -put_unaligned_be32 (nonce2, &input[SHA256_BLOCK_SIZE +4 ]); +memcpy (&input[SHA256_BLOCK_SIZE ], msg, len);
Now that 'len' could be anything, the code should check that it's not longer than SHA256_DIGEST_SIZE. As for what to do if it's too big, maybe a WARN_ON_ONCE() and limit it to SHA256_DIGEST_SIZE?
Other than that, looks good.
Mat
Quoted 105 lines
net/mptcp/crypto.c +6
-2sha256_init (&state); -sha256_update (&state, input,SHA256_BLOCK_SIZE +8 ); +sha256_update (&state, input,SHA256_BLOCK_SIZE + len);/* emit sha256(K1 || msg) on the second input block, so we can * reuse 'input' for the last hashing @@ -125,6 +123,7 @@ static int __init test_mptcp_crypto(void)char hmac[20 ], hmac_hex[41 ];u32 nonce1, nonce2;u64 key1, key2; +u8 msg[8 ];int i, j;for (i =0 ; i <ARRAY_SIZE (tests); ++i) {@@ -134,7 +133,10 @@ static int __init test_mptcp_crypto(void) nonce1 =be32_to_cpu (*((__be32 *)&tests[i].msg[0 ])); nonce2 =be32_to_cpu (*((__be32 *)&tests[i].msg[4 ])); -mptcp_crypto_hmac_sha (key1, key2, nonce1, nonce2, hmac); +put_unaligned_be32 (nonce1, &msg[0 ]); +put_unaligned_be32 (nonce2, &msg[4 ]); + +mptcp_crypto_hmac_sha (key1, key2, msg,8 , hmac);for (j =0 ; j <20 ; ++j)sprintf (&hmac_hex[j <<1 ],"%02x" , hmac[j] &0xff ); hmac_hex[40 ] =0 ;net/mptcp/protocol.h +1
-2@@ -339,8 +339,7 @@ static inline void mptcp_crypto_key_gen_sha(u64 *key, u32 *token, u64 *idsn)mptcp_crypto_key_sha (*key, token, idsn); } -void mptcp_crypto_hmac_sha (u64 key1,u64 key2,u32 nonce1,u32 nonce2, -void *hash_out); +void mptcp_crypto_hmac_sha (u64 key1,u64 key2,u8 *msg,int len,void *hmac);void mptcp_pm_init (void );void mptcp_pm_new_connection (struct mptcp_sock *msk,int server_side);net/mptcp/subflow.c +15
-4@@ -61,6 +61,17 @@ static void subflow_req_destructor(struct request_sock *req) tcp_request_sock_ops.destructor (req); } +static void subflow_generate_hmac (u64 key1,u64 key2,u32 nonce1,u32 nonce2, +void *hmac) +{ +u8 msg[8 ]; + +put_unaligned_be32 (nonce1, &msg[0 ]); +put_unaligned_be32 (nonce2, &msg[4 ]); + +mptcp_crypto_hmac_sha (key1, key2, msg,8 , (u32 *)hmac); +} +/* validate received token and create truncated hmac and nonce for SYN-ACK */ static bool subflow_token_join_request (struct request_sock *req,const struct sk_buff *skb)@@ -82,7 +93,7 @@ static bool subflow_token_join_request(struct request_sock *req,get_random_bytes (&subflow_req->local_nonce,sizeof (u32)); -mptcp_crypto_hmac_sha (msk->local_key, msk->remote_key, +subflow_generate_hmac (msk->local_key, msk->remote_key, subflow_req->local_nonce, subflow_req->remote_nonce, (u32 *)hmac);@@ -180,7 +191,7 @@ static bool subflow_thmac_valid(struct mptcp_subflow_context *subflow)u8 hmac[MPTCPOPT_HMAC_LEN ];u64 thmac; -mptcp_crypto_hmac_sha (subflow->remote_key, subflow->local_key, +subflow_generate_hmac (subflow->remote_key, subflow->local_key, subflow->remote_nonce, subflow->local_nonce, (u32 *)hmac);@@ -225,7 +236,7 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) goto do_reset; } -mptcp_crypto_hmac_sha (subflow->local_key, subflow->remote_key, +subflow_generate_hmac (subflow->local_key, subflow->remote_key, subflow->local_nonce, subflow->remote_nonce, (u32 *)subflow->hmac);@@ -305,7 +316,7 @@ static bool subflow_hmac_valid(const struct request_sock *req,if (!msk)return false; -mptcp_crypto_hmac_sha (msk->remote_key, msk->local_key, +subflow_generate_hmac (msk->remote_key, msk->local_key, subflow_req->remote_nonce, subflow_req->local_nonce, (u32 *)hmac);Signature · 4 lines
2.17.2 _______________________________________________ mptcp mailing list -- mptcp(a)lists.01.org To unsubscribe send an email to mptcp-leave(a)lists.01.org
--
Mat Martineau
Intel
Peter Krystad
[MPTCP] Re: [PATCH 1/2] mptcp: Re-factor mptcp_crypto_hmac_sha()
Quoted 32 lines · Mat Martineau
Quoted 30 lines · Peter Krystad
Allow it to take variable-length messages so that v1
ADD_ADDRoption processing may use it.squashto: Add
ADD_ADDRhandlingSigned-off-by Peter Krystad <peter.krystad(a)linux.intel.com>---
net/mptcp/crypto.c | 14 ++++++++------ net/mptcp/protocol.h | 3 +-- net/mptcp/subflow.c | 19 +++++++++++++++---- 3 files changed, 24 insertions(+), 12 deletions(-)net/mptcp/crypto.c +1
-2@@ -44,8 +44,7 @@ void mptcp_crypto_key_sha(u64 key, u32 *token, u64 *idsn) *idsn =be64_to_cpu (*((__be64 *)&mptcp_hashed_key[6 ])); } -void mptcp_crypto_hmac_sha (u64 key1,u64 key2,u32 nonce1,u32 nonce2, -void *hmac) +void mptcp_crypto_hmac_sha (u64 key1,u64 key2,u8 *msg,int len,void *hmac) {u8 input[SHA256_BLOCK_SIZE +SHA256_DIGEST_SIZE ];__be32 mptcp_hashed_key[SHA256_DIGEST_WORDS ];@@ -65,11 +64,10 @@ void mptcp_crypto_hmac_sha(u64 key1, u64 key2, u32 nonce1, u32 nonce2,for (i =0 ; i <8 ; i++) input[i +8 ] ^= key2be[i];
Quoted 7 lines
net/mptcp/crypto.c void mptcp_crypto_hmac_sha(u64 key1, u64 key2, u32 nonce1, u32 nonce2, · line 67
Quoted 3 lines
net/mptcp/crypto.c +1
-2-put_unaligned_be32 (nonce1, &input[SHA256_BLOCK_SIZE ]); -put_unaligned_be32 (nonce2, &input[SHA256_BLOCK_SIZE +4 ]); +memcpy (&input[SHA256_BLOCK_SIZE ], msg, len);Now that 'len' could be anything, the code should check that it's not longer than
SHA256_DIGEST_SIZE. As for what to do if it's too big, maybe aWARN_ON_ONCE()and limit it toSHA256_DIGEST_SIZE?
Will do.
Peter.
Quoted 112 lines
Other than that, looks good.
Mat
Quoted 104 lines
net/mptcp/crypto.c +6
-2sha256_init (&state); -sha256_update (&state, input,SHA256_BLOCK_SIZE +8 ); +sha256_update (&state, input,SHA256_BLOCK_SIZE + len);/* emit sha256(K1 || msg) on the second input block, so we can * reuse 'input' for the last hashing @@ -125,6 +123,7 @@ static int __init test_mptcp_crypto(void)char hmac[20 ], hmac_hex[41 ];u32 nonce1, nonce2;u64 key1, key2; +u8 msg[8 ];int i, j;for (i =0 ; i <ARRAY_SIZE (tests); ++i) {@@ -134,7 +133,10 @@ static int __init test_mptcp_crypto(void) nonce1 =be32_to_cpu (*((__be32 *)&tests[i].msg[0 ])); nonce2 =be32_to_cpu (*((__be32 *)&tests[i].msg[4 ])); -mptcp_crypto_hmac_sha (key1, key2, nonce1, nonce2, hmac); +put_unaligned_be32 (nonce1, &msg[0 ]); +put_unaligned_be32 (nonce2, &msg[4 ]); + +mptcp_crypto_hmac_sha (key1, key2, msg,8 , hmac);for (j =0 ; j <20 ; ++j)sprintf (&hmac_hex[j <<1 ],"%02x" , hmac[j] &0xff ); hmac_hex[40 ] =0 ;net/mptcp/protocol.h +1
-2@@ -339,8 +339,7 @@ static inline void mptcp_crypto_key_gen_sha(u64 *key, u32 *token, u64 *idsn)mptcp_crypto_key_sha (*key, token, idsn); } -void mptcp_crypto_hmac_sha (u64 key1,u64 key2,u32 nonce1,u32 nonce2, -void *hash_out); +void mptcp_crypto_hmac_sha (u64 key1,u64 key2,u8 *msg,int len,void *hmac);void mptcp_pm_init (void );void mptcp_pm_new_connection (struct mptcp_sock *msk,int server_side);net/mptcp/subflow.c +15
-4@@ -61,6 +61,17 @@ static void subflow_req_destructor(struct request_sock *req) tcp_request_sock_ops.destructor (req); } +static void subflow_generate_hmac (u64 key1,u64 key2,u32 nonce1,u32 nonce2, +void *hmac) +{ +u8 msg[8 ]; + +put_unaligned_be32 (nonce1, &msg[0 ]); +put_unaligned_be32 (nonce2, &msg[4 ]); + +mptcp_crypto_hmac_sha (key1, key2, msg,8 , (u32 *)hmac); +} +/* validate received token and create truncated hmac and nonce for SYN-ACK */ static bool subflow_token_join_request (struct request_sock *req,const struct sk_buff *skb)@@ -82,7 +93,7 @@ static bool subflow_token_join_request(struct request_sock *req,get_random_bytes (&subflow_req->local_nonce,sizeof (u32)); -mptcp_crypto_hmac_sha (msk->local_key, msk->remote_key, +subflow_generate_hmac (msk->local_key, msk->remote_key, subflow_req->local_nonce, subflow_req->remote_nonce, (u32 *)hmac);@@ -180,7 +191,7 @@ static bool subflow_thmac_valid(struct mptcp_subflow_context *subflow)u8 hmac[MPTCPOPT_HMAC_LEN ];u64 thmac; -mptcp_crypto_hmac_sha (subflow->remote_key, subflow->local_key, +subflow_generate_hmac (subflow->remote_key, subflow->local_key, subflow->remote_nonce, subflow->local_nonce, (u32 *)hmac);@@ -225,7 +236,7 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) goto do_reset; } -mptcp_crypto_hmac_sha (subflow->local_key, subflow->remote_key, +subflow_generate_hmac (subflow->local_key, subflow->remote_key, subflow->local_nonce, subflow->remote_nonce, (u32 *)subflow->hmac);@@ -305,7 +316,7 @@ static bool subflow_hmac_valid(const struct request_sock *req,if (!msk)return false; -mptcp_crypto_hmac_sha (msk->remote_key, msk->local_key, +subflow_generate_hmac (msk->remote_key, msk->local_key, subflow_req->remote_nonce, subflow_req->local_nonce, (u32 *)hmac);Signature · 4 lines
2.17.2 _______________________________________________ mptcp mailing list -- mptcp(a)lists.01.org To unsubscribe send an email to mptcp-leave(a)lists.01.org--
Mat Martineau
Intel
Peter Krystad
PATCH 2/2 mptcp: Make v1 changes for ADD_ADDR and RM_ADDR options
In reply to Peter KrystadUse union to minimize space used in struct mptcp_received_options. Remove family field and add hmac and port fields.
squashto: Add ADD_ADDR handling
--- include/linux/tcp.h | 22 +++--- include/net/mptcp.h | 2 + net/mptcp/options.c | 180 ++++++++++++++++++++++++++++++++++--------- net/mptcp/protocol.h | 17 ++-- 4 files changed, 170 insertions(+), 51 deletions(-)
include/linux/tcp.h +12 -10
@@ -86,9 +86,20 @@ struct mptcp_options_received {u64 data_seq;u32 subflow_seq;u16 data_len; +struct in_addr addr; +#if IS_ENABLED (CONFIG_MPTCP_IPV6 ) +struct in6_addr addr6; +#endif +u64 ahmac; +u8 addr_id; +u8 rm_id; u8 mp_capable : 1, mp_join : 1, dss : 1, + add_addr : 1, + add_addr6 : 1, + rm_addr : 1, + echo : 1, backup : 1;u8 join_id;u32 token;
@@ -102,16 +113,6 @@ struct mptcp_options_received { ack64:1, mpc_map:1, __unused:2; - u8 add_addr : 1, - rm_addr : 1, - family : 4; -u8 addr_id; -union { -struct in_addr addr; -#if IS_ENABLED (CONFIG_IPV6 ) -struct in6_addr addr6; -#endif - }; };#endif
@@ -148,6 +149,7 @@ static inline void tcp_clear_options(struct tcp_options_received *rx_opt) rx_opt->mptcp.mp_capable =0 ; rx_opt->mptcp.mp_join =0 ; rx_opt->mptcp.add_addr =0 ; + rx_opt->mptcp.add_addr6 =0 ; rx_opt->mptcp.rm_addr =0 ; rx_opt->mptcp.dss =0 ;#endif
include/net/mptcp.h +2 -0
@@ -42,6 +42,8 @@ struct mptcp_out_options {#endif };u8 addr_id; +u64 ahmac; +u8 rm_id;u8 join_id;u8 backup;u32 nonce;
net/mptcp/options.c +145 -35
254 lines not on this page · raw message
net/mptcp/protocol.h +11 -6
@@ -48,9 +48,16 @@#define TCPOLEN_MPTCP_DSS_MAP32 10#define TCPOLEN_MPTCP_DSS_MAP64 14#define TCPOLEN_MPTCP_DSS_CHECKSUM 2 -#define TCPOLEN_MPTCP_ADD_ADDR 8 -#define TCPOLEN_MPTCP_ADD_ADDR6 20 -#define TCPOLEN_MPTCP_RM_ADDR 4 +#define TCPOLEN_MPTCP_ADD_ADDR 16 +#define TCPOLEN_MPTCP_ADD_ADDR_PORT 18 +#define TCPOLEN_MPTCP_ADD_ADDR_BASE 8 +#define TCPOLEN_MPTCP_ADD_ADDR_BASE_PORT 10 +#define TCPOLEN_MPTCP_ADD_ADDR6 28 +#define TCPOLEN_MPTCP_ADD_ADDR6_PORT 30 +#define TCPOLEN_MPTCP_ADD_ADDR6_BASE 20 +#define TCPOLEN_MPTCP_ADD_ADDR6_BASE_PORT 22 +#define TCPOLEN_MPTCP_PORT_LEN 2 +#define TCPOLEN_MPTCP_RM_ADDR_BASE 4/* MPTCP MP_JOIN flags */ #define MPTCPOPT_BACKUP BIT(0)
@@ -73,9 +80,7 @@#define MPTCP_DSS_FLAG_MASK (0x1F)/* MPTCP ADD_ADDR flags */ -#define MPTCP_ADDR_FAMILY_MASK (0x0F) -#define MPTCP_ADDR_IPVERSION_4 4 -#define MPTCP_ADDR_IPVERSION_6 6 +#define MPTCP_ADDR_ECHO BIT(0)/* MPTCP socket flags */ #define MPTCP_DATA_READY BIT(0)
Signature · 1 line
2.17.2
Mat Martineau
[MPTCP] Re: [PATCH 2/2] mptcp: Make v1 changes for ADD_ADDR and RM_ADDR options
Quoted 18 lines · Peter Krystad
Use union to minimize space used in struct
mptcp_received_options. Remove family field and add hmac and port fields.squashto: Add
ADD_ADDRhandlingSigned-off-by Peter Krystad <peter.krystad(a)linux.intel.com>---
include/linux/tcp.h | 22 +++--- include/net/mptcp.h | 2 + net/mptcp/options.c | 180 ++++++++++++++++++++++++++++++++++--------- net/mptcp/protocol.h | 17 ++-- 4 files changed, 170 insertions(+), 51 deletions(-)include/linux/tcp.h +0
-0
include/linux/tcp.h struct mptcp_options_received { · line 92
Quoted 7 lines
include/linux/tcp.h +4
-0@@ -86,9 +86,20 @@ struct mptcp_options_received {u64 data_seq;u32 subflow_seq;u16 data_len; +struct in_addr addr; +#if IS_ENABLED (CONFIG_MPTCP_IPV6 ) +struct in6_addr addr6; +#endif
The commit message says "Use union...", but it looks like this moved addr and addr6 out of a union. Could you clarify the intent here?
Quoted 157 lines
include/linux/tcp.h +8
-10+u64 ahmac; +u8 addr_id; +u8 rm_id; u8 mp_capable : 1, mp_join : 1, dss : 1, + add_addr : 1, + add_addr6 : 1, + rm_addr : 1, + echo : 1, backup : 1;u8 join_id;u32 token;@@ -102,16 +113,6 @@ struct mptcp_options_received { ack64:1, mpc_map:1, __unused:2; - u8 add_addr : 1, - rm_addr : 1, - family : 4; -u8 addr_id; -union { -struct in_addr addr; -#if IS_ENABLED (CONFIG_IPV6 ) -struct in6_addr addr6; -#endif - }; };#endif @@ -148,6 +149,7 @@ static inline void tcp_clear_options(struct tcp_options_received *rx_opt) rx_opt->mptcp.mp_capable =0 ; rx_opt->mptcp.mp_join =0 ; rx_opt->mptcp.add_addr =0 ; + rx_opt->mptcp.add_addr6 =0 ; rx_opt->mptcp.rm_addr =0 ; rx_opt->mptcp.dss =0 ;#endif include/net/mptcp.h +2
-0@@ -42,6 +42,8 @@ struct mptcp_out_options {#endif };u8 addr_id; +u64 ahmac; +u8 rm_id;u8 join_id;u8 backup;u32 nonce;net/mptcp/options.c +52
-23@@ -212,45 +212,56 @@ void mptcp_parse_option(const struct sk_buff *skb, const unsigned char *ptr,break ;case MPTCPOPT_ADD_ADDR : -if (opsize !=TCPOLEN_MPTCP_ADD_ADDR && - opsize !=TCPOLEN_MPTCP_ADD_ADDR6 ) -break ; - mp_opt->family = *ptr++ &MPTCP_ADDR_FAMILY_MASK ; -if (mp_opt->family !=MPTCP_ADDR_IPVERSION_4 && - mp_opt->family !=MPTCP_ADDR_IPVERSION_6 ) -break ; - -if (mp_opt->family ==MPTCP_ADDR_IPVERSION_4 && - opsize !=TCPOLEN_MPTCP_ADD_ADDR ) -break ; + mp_opt->echo = (*ptr++) &MPTCP_ADDR_ECHO ; +if (!mp_opt->echo) { +if (opsize ==TCPOLEN_MPTCP_ADD_ADDR || + opsize ==TCPOLEN_MPTCP_ADD_ADDR_PORT ) + mp_opt->add_addr =1 ; #if IS_ENABLED(CONFIG_MPTCP_IPV6) -if (mp_opt->family ==MPTCP_ADDR_IPVERSION_6 && - opsize !=TCPOLEN_MPTCP_ADD_ADDR6 ) -break ; + else if (opsize == TCPOLEN_MPTCP_ADD_ADDR6 || + opsize == TCPOLEN_MPTCP_ADD_ADDR6_PORT) + mp_opt->add_addr6 = 1; +#endif + else + break; + }else { +if (opsize ==TCPOLEN_MPTCP_ADD_ADDR_BASE || + opsize ==TCPOLEN_MPTCP_ADD_ADDR_BASE_PORT ) + mp_opt->add_addr =1 ; +#if IS_ENABLED(CONFIG_MPTCP_IPV6) + else if (opsize == TCPOLEN_MPTCP_ADD_ADDR6_BASE || + opsize == TCPOLEN_MPTCP_ADD_ADDR6_BASE_PORT) + mp_opt->add_addr6 = 1;#endif + else + break; + } + mp_opt->addr_id = *ptr++; -if (mp_opt->family ==MPTCP_ADDR_IPVERSION_4 ) { - mp_opt->add_addr =1 ; +pr_debug ("ADD_ADDR: id=%d" , mp_opt->addr_id); +if (mp_opt->add_addr ==1 ) {memcpy ((u8 *)&mp_opt->addr.s_addr, (u8 *)ptr,4 ); -pr_debug ("ADD_ADDR: addr=%x, id=%d" , - mp_opt->addr.s_addr, mp_opt->addr_id); + ptr +=4 ; }#if IS_ENABLED (CONFIG_MPTCP_IPV6 ) else { - mp_opt->add_addr =1 ;memcpy (mp_opt->addr6.s6_addr, (u8 *)ptr,16 ); -pr_debug ("ADD_ADDR: addr6=, id=%d" , mp_opt->addr_id); + ptr +=16 ; }#endif +if (!mp_opt->echo) { + mp_opt->ahmac =get_unaligned_be64 (ptr); + ptr +=8 ; + }break ;case MPTCPOPT_RM_ADDR : -if (opsize !=TCPOLEN_MPTCP_RM_ADDR ) +if (opsize !=TCPOLEN_MPTCP_RM_ADDR_BASE )break ; mp_opt->rm_addr =1 ; - mp_opt->addr_id = *ptr++; -pr_debug ("RM_ADDR: id=%d" , mp_opt->addr_id); + mp_opt->rm_id = *ptr++; +pr_debug ("RM_ADDR: id=%d" , mp_opt->rm_id);break ;default :@@ -482,6 +493,38 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb,return true; } +static u64 add_addr_generate_hmac (u64 key1,u64 key2,u8 addr_id, +struct in_addr *addr) +{ +u8 hmac[MPTCPOPT_HMAC_LEN ]; +u8 msg[7 ]; + + msg[0 ] = addr_id; +memcpy (&msg[1 ], &addr->s_addr,4 ); + msg[5 ] =0 ; + msg[6 ] =0 ; + +mptcp_crypto_hmac_sha (key1, key2, msg,7 , (u32 *)hmac); + +return get_unaligned_be64 (hmac); +} + +static u64 add_addr6_generate_hmac (u64 key1,u64 key2,u8 addr_id, +struct in6_addr *addr)
net/mptcp/options.c static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb, · line 523
Quoted 10 lines
net/mptcp/options.c +10
-0+{ +u8 hmac[MPTCPOPT_HMAC_LEN ]; +u8 msg[19 ]; + + msg[0 ] = addr_id; +memcpy (&msg[1 ], &addr->s6_addr,16 ); + msg[17 ] =0 ; + msg[18 ] =0 ; + +mptcp_crypto_hmac_sha (key1, key2, msg,19 , (u32 *)hmac);
Why the cast to u32* here?
Thanks,
Mat
Quoted 186 lines
net/mptcp/options.c +54
-5+ +return get_unaligned_be64 (hmac); +} + static bool mptcp_established_options_addr(struct sock *sk, unsigned int *size, unsigned int remaining,@@ -507,6 +550,11 @@ static bool mptcp_established_options_addr(struct sock *sk, opts->suboptions |=OPTION_MPTCP_ADD_ADDR ; opts->addr_id = id; opts->addr = ((struct sockaddr_in *)&saddr)->sin_addr; + opts->ahmac =add_addr_generate_hmac (subflow->local_key, + subflow->remote_key, + opts->addr_id, + &opts->addr); +pr_debug ("addr_id=%d, ahmac=%llu" , opts->addr_id, opts->ahmac); *size =TCPOLEN_MPTCP_ADD_ADDR ; }#if IS_ENABLED (CONFIG_MPTCP_IPV6 )@@ -516,6 +564,11 @@ static bool mptcp_established_options_addr(struct sock *sk, opts->suboptions |=OPTION_MPTCP_ADD_ADDR6 ; opts->addr_id = id; opts->addr6 = ((struct sockaddr_in6 *)&saddr)->sin6_addr; + opts->ahmac =add_addr6_generate_hmac (subflow->local_key, + subflow->remote_key, + opts->addr_id, + &opts->addr6); +pr_debug ("addr_id=%d, ahmac=%llu" , opts->addr_id, opts->ahmac); *size = TCPOLEN_MPTCP_ADD_ADDR6; }#endif @@ -656,6 +709,36 @@ static void update_una(struct mptcp_sock *msk, } } +static bool add_addr_hmac_valid (struct mptcp_subflow_context *subflow, +struct mptcp_options_received *mp_opt) +{ +u64 ahmac; + + ahmac =add_addr_generate_hmac (subflow->remote_key, subflow->local_key, + mp_opt->addr_id, &mp_opt->addr); + +pr_debug ("subflow=%p, ahmac=%llu, mp_opt->ahmac=%llu\n" , + subflow, (unsigned long long )ahmac, + (unsigned long long )mp_opt->ahmac); + +return ahmac == mp_opt->ahmac; +} + +static bool add_addr6_hmac_valid (struct mptcp_subflow_context *subflow, +struct mptcp_options_received *mp_opt) +{ +u64 ahmac; + + ahmac =add_addr6_generate_hmac (subflow->remote_key, subflow->local_key, + mp_opt->addr_id, &mp_opt->addr6); + +pr_debug ("subflow=%p, ahmac=%llu, mp_opt->ahmac=%llu\n" , + subflow, (unsigned long long )ahmac, + (unsigned long long )mp_opt->ahmac); + +return ahmac == mp_opt->ahmac; +} +void mptcp_incoming_options (struct sock *sk,struct sk_buff *skb,struct tcp_options_received *opt_rx) {@@ -669,15 +752,20 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb,return ;if (msk && mp_opt->add_addr) { -if (mp_opt->family ==MPTCP_ADDR_IPVERSION_4 ) -mptcp_pm_add_addr (msk, &mp_opt->addr, mp_opt->addr_id); +pr_debug ("subflow=%p, ahmac=%llu" , subflow, mp_opt->ahmac); +if (!mp_opt->echo &&add_addr_hmac_valid (subflow, mp_opt)) +mptcp_pm_add_addr (msk, &mp_opt->addr, + mp_opt->addr_id); + mp_opt->add_addr =0 ; + } #if IS_ENABLED(CONFIG_MPTCP_IPV6) - else if (mp_opt->family == MPTCP_ADDR_IPVERSION_6) + else if (msk && mp_opt->add_addr6) { +if (!mp_opt->echo &&add_addr6_hmac_valid (subflow, mp_opt))mptcp_pm_add_addr6 (msk, &mp_opt->addr6, mp_opt->addr_id); -#endif - mp_opt->add_addr =0 ; + mp_opt->add_addr6 =0 ; } +#endif if (!mp_opt->dss)return ;@@ -760,25 +848,47 @@ void mptcp_write_options(__be32 *ptr, struct mptcp_out_options *opts)
mp_capable_done:if (OPTION_MPTCP_ADD_ADDR & opts->suboptions) {net/mptcp/options.c +9
-2- *ptr++ =mptcp_option (MPTCPOPT_ADD_ADDR ,TCPOLEN_MPTCP_ADD_ADDR , -MPTCP_ADDR_IPVERSION_4 , opts->addr_id); +if (opts->ahmac) + *ptr++ =mptcp_option (MPTCPOPT_ADD_ADDR , +TCPOLEN_MPTCP_ADD_ADDR ,0 , + opts->addr_id); +else + *ptr++ =mptcp_option (MPTCPOPT_ADD_ADDR , +TCPOLEN_MPTCP_ADD_ADDR_BASE , +MPTCP_ADDR_ECHO , + opts->addr_id);memcpy((u8 *)ptr, (u8 *)&opts->addr.s_addr, 4); ptr += 1;net/mptcp/options.c +4
-0+if (opts->ahmac) { +put_unaligned_be64 (opts->ahmac, ptr); + ptr +=2 ; + }}#if IS_ENABLED(CONFIG_MPTCP_IPV6) if (OPTION_MPTCP_ADD_ADDR6 & opts->suboptions) {net/mptcp/options.c +9
-3- *ptr++ =mptcp_option (MPTCPOPT_ADD_ADDR , -TCPOLEN_MPTCP_ADD_ADDR6 , -MPTCP_ADDR_IPVERSION_6 , opts->addr_id); +if (opts->ahmac) + *ptr++ =mptcp_option (MPTCPOPT_ADD_ADDR , +TCPOLEN_MPTCP_ADD_ADDR6 ,0 , + opts->addr_id); +else + *ptr++ =mptcp_option (MPTCPOPT_ADD_ADDR , +TCPOLEN_MPTCP_ADD_ADDR6_BASE , +MPTCP_ADDR_ECHO , + opts->addr_id);memcpy((u8 *)ptr, opts->addr6.s6_addr, 16); ptr += 4;net/mptcp/options.c +4
-0+if (opts->ahmac) { +put_unaligned_be64 (opts->ahmac, ptr); + ptr +=2 ; + }}#endif
if (OPTION_MPTCP_RM_ADDR & opts->suboptions) {net/mptcp/options.c +3
-2- *ptr++ =mptcp_option (MPTCPOPT_RM_ADDR ,TCPOLEN_MPTCP_RM_ADDR , -0 , opts->addr_id); + *ptr++ =mptcp_option (MPTCPOPT_RM_ADDR , +TCPOLEN_MPTCP_RM_ADDR_BASE , +0 , opts->rm_id);} if (OPTION_MPTCP_MPJ_SYN & opts->suboptions) {net/mptcp/protocol.h +11
-6@@ -48,9 +48,16 @@#define TCPOLEN_MPTCP_DSS_MAP32 10#define TCPOLEN_MPTCP_DSS_MAP64 14#define TCPOLEN_MPTCP_DSS_CHECKSUM 2 -#define TCPOLEN_MPTCP_ADD_ADDR 8 -#define TCPOLEN_MPTCP_ADD_ADDR6 20 -#define TCPOLEN_MPTCP_RM_ADDR 4 +#define TCPOLEN_MPTCP_ADD_ADDR 16 +#define TCPOLEN_MPTCP_ADD_ADDR_PORT 18 +#define TCPOLEN_MPTCP_ADD_ADDR_BASE 8 +#define TCPOLEN_MPTCP_ADD_ADDR_BASE_PORT 10 +#define TCPOLEN_MPTCP_ADD_ADDR6 28 +#define TCPOLEN_MPTCP_ADD_ADDR6_PORT 30 +#define TCPOLEN_MPTCP_ADD_ADDR6_BASE 20 +#define TCPOLEN_MPTCP_ADD_ADDR6_BASE_PORT 22 +#define TCPOLEN_MPTCP_PORT_LEN 2 +#define TCPOLEN_MPTCP_RM_ADDR_BASE 4/* MPTCP MP_JOIN flags */ #define MPTCPOPT_BACKUP BIT(0)@@ -73,9 +80,7 @@#define MPTCP_DSS_FLAG_MASK (0x1F)/* MPTCP ADD_ADDR flags */ -#define MPTCP_ADDR_FAMILY_MASK (0x0F) -#define MPTCP_ADDR_IPVERSION_4 4 -#define MPTCP_ADDR_IPVERSION_6 6 +#define MPTCP_ADDR_ECHO BIT(0)/* MPTCP socket flags */ #define MPTCP_DATA_READY BIT(0)Signature · 1 line
2.17.2
--
Mat Martineau
Intel
Peter Krystad
[MPTCP] Re: [PATCH 2/2] mptcp: Make v1 changes for ADD_ADDR and RM_ADDR options
Quoted 15 lines · Mat Martineau
Quoted 13 lines · Peter Krystad
Use union to minimize space used in struct
mptcp_received_options. Remove family field and add hmac and port fields.squashto: Add
ADD_ADDRhandlingSigned-off-by Peter Krystad <peter.krystad(a)linux.intel.com>---
include/linux/tcp.h | 22 +++--- include/net/mptcp.h | 2 + net/mptcp/options.c | 180 ++++++++++++++++++++++++++++++++++--------- net/mptcp/protocol.h | 17 ++-- 4 files changed, 170 insertions(+), 51 deletions(-)
Quoted 15 lines
include/linux/tcp.h struct mptcp_options_received { · line 92
Quoted 12 lines
include/linux/tcp.h +4
-0@@ -86,9 +86,20 @@ struct mptcp_options_received {u64 data_seq;u32 subflow_seq;u16 data_len; +struct in_addr addr; +#if IS_ENABLED (CONFIG_MPTCP_IPV6 ) +struct in6_addr addr6; +#endif The commit message says "Use union...", but it looks like this moved addr and addr6 out of a union. Could you clarify the intent here?
I will revise the commit message, and for now will stick with addr and addr6 in a union. This commit message was from old 'optimized mptcp_options_received' commit.
Quoted 162 lines
Quoted 162 lines
include/linux/tcp.h +8
-10+u64 ahmac; +u8 addr_id; +u8 rm_id; u8 mp_capable : 1, mp_join : 1, dss : 1, + add_addr : 1, + add_addr6 : 1, + rm_addr : 1, + echo : 1, backup : 1;u8 join_id;u32 token;@@ -102,16 +113,6 @@ struct mptcp_options_received { ack64:1, mpc_map:1, __unused:2; - u8 add_addr : 1, - rm_addr : 1, - family : 4; -u8 addr_id; -union { -struct in_addr addr; -#if IS_ENABLED (CONFIG_IPV6 ) -struct in6_addr addr6; -#endif - }; };#endif @@ -148,6 +149,7 @@ static inline void tcp_clear_options(struct tcp_options_received *rx_opt) rx_opt->mptcp.mp_capable =0 ; rx_opt->mptcp.mp_join =0 ; rx_opt->mptcp.add_addr =0 ; + rx_opt->mptcp.add_addr6 =0 ; rx_opt->mptcp.rm_addr =0 ; rx_opt->mptcp.dss =0 ;#endif include/net/mptcp.h +2
-0@@ -42,6 +42,8 @@ struct mptcp_out_options {#endif };u8 addr_id; +u64 ahmac; +u8 rm_id;u8 join_id;u8 backup;u32 nonce;net/mptcp/options.c +56
-23@@ -212,45 +212,56 @@ void mptcp_parse_option(const struct sk_buff *skb, const unsigned char *ptr,break ;case MPTCPOPT_ADD_ADDR : -if (opsize !=TCPOLEN_MPTCP_ADD_ADDR && - opsize !=TCPOLEN_MPTCP_ADD_ADDR6 ) -break ; - mp_opt->family = *ptr++ &MPTCP_ADDR_FAMILY_MASK ; -if (mp_opt->family !=MPTCP_ADDR_IPVERSION_4 && - mp_opt->family !=MPTCP_ADDR_IPVERSION_6 ) -break ; - -if (mp_opt->family ==MPTCP_ADDR_IPVERSION_4 && - opsize !=TCPOLEN_MPTCP_ADD_ADDR ) -break ; + mp_opt->echo = (*ptr++) &MPTCP_ADDR_ECHO ; +if (!mp_opt->echo) { +if (opsize ==TCPOLEN_MPTCP_ADD_ADDR || + opsize ==TCPOLEN_MPTCP_ADD_ADDR_PORT ) + mp_opt->add_addr =1 ; #if IS_ENABLED(CONFIG_MPTCP_IPV6) -if (mp_opt->family ==MPTCP_ADDR_IPVERSION_6 && - opsize !=TCPOLEN_MPTCP_ADD_ADDR6 ) -break ; + else if (opsize == TCPOLEN_MPTCP_ADD_ADDR6 || + opsize == TCPOLEN_MPTCP_ADD_ADDR6_PORT) + mp_opt->add_addr6 = 1; +#endif + else + break; + }else { +if (opsize ==TCPOLEN_MPTCP_ADD_ADDR_BASE || + opsize ==TCPOLEN_MPTCP_ADD_ADDR_BASE_PORT ) + mp_opt->add_addr =1 ; +#if IS_ENABLED(CONFIG_MPTCP_IPV6) + else if (opsize == TCPOLEN_MPTCP_ADD_ADDR6_BASE || + opsize == TCPOLEN_MPTCP_ADD_ADDR6_BASE_PORT) + mp_opt->add_addr6 = 1;#endif + else + break; + } + mp_opt->addr_id = *ptr++; -if (mp_opt->family ==MPTCP_ADDR_IPVERSION_4 ) { - mp_opt->add_addr =1 ; +pr_debug ("ADD_ADDR: id=%d" , mp_opt->addr_id); +if (mp_opt->add_addr ==1 ) {memcpy ((u8 *)&mp_opt->addr.s_addr, (u8 *)ptr,4 ); -pr_debug ("ADD_ADDR: addr=%x, id=%d" , - mp_opt->addr.s_addr, mp_opt->addr_id); + ptr +=4 ; }#if IS_ENABLED (CONFIG_MPTCP_IPV6 ) else { - mp_opt->add_addr =1 ;memcpy (mp_opt->addr6.s6_addr, (u8 *)ptr,16 ); -pr_debug ("ADD_ADDR: addr6=, id=%d" , mp_opt->addr_id); + ptr +=16 ; }#endif +if (!mp_opt->echo) { + mp_opt->ahmac =get_unaligned_be64 (ptr); + ptr +=8 ; + }break ;case MPTCPOPT_RM_ADDR : -if (opsize !=TCPOLEN_MPTCP_RM_ADDR ) +if (opsize !=TCPOLEN_MPTCP_RM_ADDR_BASE )break ; mp_opt->rm_addr =1 ; - mp_opt->addr_id = *ptr++; -pr_debug ("RM_ADDR: id=%d" , mp_opt->addr_id); + mp_opt->rm_id = *ptr++; +pr_debug ("RM_ADDR: id=%d" , mp_opt->rm_id);break ;default :@@ -482,6 +493,38 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb,return true; } +static u64 add_addr_generate_hmac (u64 key1,u64 key2,u8 addr_id, +struct in_addr *addr) +{ +u8 hmac[MPTCPOPT_HMAC_LEN ]; +u8 msg[7 ]; + + msg[0 ] = addr_id; +memcpy (&msg[1 ], &addr->s_addr,4 ); + msg[5 ] =0 ; + msg[6 ] =0 ; + +mptcp_crypto_hmac_sha (key1, key2, msg,7 , (u32 *)hmac); + +return get_unaligned_be64 (hmac); +} + +static u64 add_addr6_generate_hmac (u64 key1,u64 key2,u8 addr_id, +struct in6_addr *addr) +{ +u8 hmac[MPTCPOPT_HMAC_LEN ]; +u8 msg[19 ]; +
Quoted 8 lines
net/mptcp/options.c static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb, · line 523
Quoted 6 lines
net/mptcp/options.c +6
-0+ msg[0 ] = addr_id; +memcpy (&msg[1 ], &addr->s6_addr,16 ); + msg[17 ] =0 ; + msg[18 ] =0 ; + +mptcp_crypto_hmac_sha (key1, key2, msg,19 , (u32 *)hmac);Why the cast to u32* here?
I'll remove these casts, they are holdovers from when the final param was a u32*. It was changed to void* in Paolo's 'move from sha1 (v0) to sha256 (v1)' commit.
Peter.
Quoted 196 lines
Thanks,
Mat
Quoted 186 lines
net/mptcp/options.c +54
-5+ +return get_unaligned_be64 (hmac); +} + static bool mptcp_established_options_addr(struct sock *sk, unsigned int *size, unsigned int remaining,@@ -507,6 +550,11 @@ static bool mptcp_established_options_addr(struct sock *sk, opts->suboptions |=OPTION_MPTCP_ADD_ADDR ; opts->addr_id = id; opts->addr = ((struct sockaddr_in *)&saddr)->sin_addr; + opts->ahmac =add_addr_generate_hmac (subflow->local_key, + subflow->remote_key, + opts->addr_id, + &opts->addr); +pr_debug ("addr_id=%d, ahmac=%llu" , opts->addr_id, opts->ahmac); *size =TCPOLEN_MPTCP_ADD_ADDR ; }#if IS_ENABLED (CONFIG_MPTCP_IPV6 )@@ -516,6 +564,11 @@ static bool mptcp_established_options_addr(struct sock *sk, opts->suboptions |=OPTION_MPTCP_ADD_ADDR6 ; opts->addr_id = id; opts->addr6 = ((struct sockaddr_in6 *)&saddr)->sin6_addr; + opts->ahmac =add_addr6_generate_hmac (subflow->local_key, + subflow->remote_key, + opts->addr_id, + &opts->addr6); +pr_debug ("addr_id=%d, ahmac=%llu" , opts->addr_id, opts->ahmac); *size = TCPOLEN_MPTCP_ADD_ADDR6; }#endif @@ -656,6 +709,36 @@ static void update_una(struct mptcp_sock *msk, } } +static bool add_addr_hmac_valid (struct mptcp_subflow_context *subflow, +struct mptcp_options_received *mp_opt) +{ +u64 ahmac; + + ahmac =add_addr_generate_hmac (subflow->remote_key, subflow->local_key, + mp_opt->addr_id, &mp_opt->addr); + +pr_debug ("subflow=%p, ahmac=%llu, mp_opt->ahmac=%llu\n" , + subflow, (unsigned long long )ahmac, + (unsigned long long )mp_opt->ahmac); + +return ahmac == mp_opt->ahmac; +} + +static bool add_addr6_hmac_valid (struct mptcp_subflow_context *subflow, +struct mptcp_options_received *mp_opt) +{ +u64 ahmac; + + ahmac =add_addr6_generate_hmac (subflow->remote_key, subflow->local_key, + mp_opt->addr_id, &mp_opt->addr6); + +pr_debug ("subflow=%p, ahmac=%llu, mp_opt->ahmac=%llu\n" , + subflow, (unsigned long long )ahmac, + (unsigned long long )mp_opt->ahmac); + +return ahmac == mp_opt->ahmac; +} +void mptcp_incoming_options (struct sock *sk,struct sk_buff *skb,struct tcp_options_received *opt_rx) {@@ -669,15 +752,20 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb,return ;if (msk && mp_opt->add_addr) { -if (mp_opt->family ==MPTCP_ADDR_IPVERSION_4 ) -mptcp_pm_add_addr (msk, &mp_opt->addr, mp_opt->addr_id); +pr_debug ("subflow=%p, ahmac=%llu" , subflow, mp_opt->ahmac); +if (!mp_opt->echo &&add_addr_hmac_valid (subflow, mp_opt)) +mptcp_pm_add_addr (msk, &mp_opt->addr, + mp_opt->addr_id); + mp_opt->add_addr =0 ; + } #if IS_ENABLED(CONFIG_MPTCP_IPV6) - else if (mp_opt->family == MPTCP_ADDR_IPVERSION_6) + else if (msk && mp_opt->add_addr6) { +if (!mp_opt->echo &&add_addr6_hmac_valid (subflow, mp_opt))mptcp_pm_add_addr6 (msk, &mp_opt->addr6, mp_opt->addr_id); -#endif - mp_opt->add_addr =0 ; + mp_opt->add_addr6 =0 ; } +#endif if (!mp_opt->dss)return ;@@ -760,25 +848,47 @@ void mptcp_write_options(__be32 *ptr, struct mptcp_out_options *opts)
mp_capable_done:if (OPTION_MPTCP_ADD_ADDR & opts->suboptions) {net/mptcp/options.c +9
-2- *ptr++ =mptcp_option (MPTCPOPT_ADD_ADDR ,TCPOLEN_MPTCP_ADD_ADDR , -MPTCP_ADDR_IPVERSION_4 , opts->addr_id); +if (opts->ahmac) + *ptr++ =mptcp_option (MPTCPOPT_ADD_ADDR , +TCPOLEN_MPTCP_ADD_ADDR ,0 , + opts->addr_id); +else + *ptr++ =mptcp_option (MPTCPOPT_ADD_ADDR , +TCPOLEN_MPTCP_ADD_ADDR_BASE , +MPTCP_ADDR_ECHO , + opts->addr_id);memcpy((u8 *)ptr, (u8 *)&opts->addr.s_addr, 4); ptr += 1;net/mptcp/options.c +4
-0+if (opts->ahmac) { +put_unaligned_be64 (opts->ahmac, ptr); + ptr +=2 ; + }}#if IS_ENABLED(CONFIG_MPTCP_IPV6) if (OPTION_MPTCP_ADD_ADDR6 & opts->suboptions) {net/mptcp/options.c +9
-3- *ptr++ =mptcp_option (MPTCPOPT_ADD_ADDR , -TCPOLEN_MPTCP_ADD_ADDR6 , -MPTCP_ADDR_IPVERSION_6 , opts->addr_id); +if (opts->ahmac) + *ptr++ =mptcp_option (MPTCPOPT_ADD_ADDR , +TCPOLEN_MPTCP_ADD_ADDR6 ,0 , + opts->addr_id); +else + *ptr++ =mptcp_option (MPTCPOPT_ADD_ADDR , +TCPOLEN_MPTCP_ADD_ADDR6_BASE , +MPTCP_ADDR_ECHO , + opts->addr_id);memcpy((u8 *)ptr, opts->addr6.s6_addr, 16); ptr += 4;net/mptcp/options.c +4
-0+if (opts->ahmac) { +put_unaligned_be64 (opts->ahmac, ptr); + ptr +=2 ; + }}#endif
if (OPTION_MPTCP_RM_ADDR & opts->suboptions) {net/mptcp/options.c +3
-2- *ptr++ =mptcp_option (MPTCPOPT_RM_ADDR ,TCPOLEN_MPTCP_RM_ADDR , -0 , opts->addr_id); + *ptr++ =mptcp_option (MPTCPOPT_RM_ADDR , +TCPOLEN_MPTCP_RM_ADDR_BASE , +0 , opts->rm_id);} if (OPTION_MPTCP_MPJ_SYN & opts->suboptions) {net/mptcp/protocol.h +11
-6@@ -48,9 +48,16 @@#define TCPOLEN_MPTCP_DSS_MAP32 10#define TCPOLEN_MPTCP_DSS_MAP64 14#define TCPOLEN_MPTCP_DSS_CHECKSUM 2 -#define TCPOLEN_MPTCP_ADD_ADDR 8 -#define TCPOLEN_MPTCP_ADD_ADDR6 20 -#define TCPOLEN_MPTCP_RM_ADDR 4 +#define TCPOLEN_MPTCP_ADD_ADDR 16 +#define TCPOLEN_MPTCP_ADD_ADDR_PORT 18 +#define TCPOLEN_MPTCP_ADD_ADDR_BASE 8 +#define TCPOLEN_MPTCP_ADD_ADDR_BASE_PORT 10 +#define TCPOLEN_MPTCP_ADD_ADDR6 28 +#define TCPOLEN_MPTCP_ADD_ADDR6_PORT 30 +#define TCPOLEN_MPTCP_ADD_ADDR6_BASE 20 +#define TCPOLEN_MPTCP_ADD_ADDR6_BASE_PORT 22 +#define TCPOLEN_MPTCP_PORT_LEN 2 +#define TCPOLEN_MPTCP_RM_ADDR_BASE 4/* MPTCP MP_JOIN flags */ #define MPTCPOPT_BACKUP BIT(0)@@ -73,9 +80,7 @@#define MPTCP_DSS_FLAG_MASK (0x1F)/* MPTCP ADD_ADDR flags */ -#define MPTCP_ADDR_FAMILY_MASK (0x0F) -#define MPTCP_ADDR_IPVERSION_4 4 -#define MPTCP_ADDR_IPVERSION_6 6 +#define MPTCP_ADDR_ECHO BIT(0)/* MPTCP socket flags */ #define MPTCP_DATA_READY BIT(0)Signature · 1 line
2.17.2--
Mat Martineau
Intel