Add support for v1 of ADD_ADDR option
Subsystems (3)
Peter Krystad
v3 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.
v2: check msg len in mptcp_crypto_hmac_sha().
remove obsolete casts
v3: Rebase and split for squashing, patches ready to be applied.
Peter Krystad (5):
mptcp: v1 ADD_ADDR changes: use subflow_generate_hmac()
mptcp: v1 ADD_ADDR changes: add subflow_generate_hmac()
mptcp: v1 ADD_ADDR changes: add_addr_hmac_valid
mptcp: Add ADD_ADDR handling
mptcp: Re-factor mptcp_crypto_hmac_sha()
include/linux/tcp.h | 12 +++++ include/net/mptcp.h | 7 +++ net/mptcp/crypto.c | 17 +++--- net/mptcp/options.c | 121 ++++++++++++++++++++++++++++++++++++++++--- net/mptcp/protocol.h | 20 ++++++- 5 files changed, 161 insertions(+), 16 deletions(-)
Signature · 1 line
2.17.2
Peter Krystad
PATCH v3 1/5 mptcp: Add ADD_ADDR handling
Add handling for sending and receiving the ADD_ADDR, ADD_ADDR6, and RM_ADDR suboptions.
squashto: Add ADD_ADDR handling
--- include/linux/tcp.h | 12 +++++ include/net/mptcp.h | 7 +++ net/mptcp/options.c | 121 ++++++++++++++++++++++++++++++++++++++++--- net/mptcp/protocol.h | 17 ++++++ 4 files changed, 149 insertions(+), 8 deletions(-)
include/linux/tcp.h +12 -0
@@ -96,6 +96,16 @@ 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
@@ -131,6 +141,8 @@ static inline void tcp_clear_options(struct tcp_options_received *rx_opt)#if IS_ENABLED (CONFIG_MPTCP ) rx_opt->mptcp.mp_capable =0 ; rx_opt->mptcp.mp_join =0 ; + rx_opt->mptcp.add_addr =0 ; + rx_opt->mptcp.rm_addr =0 ; rx_opt->mptcp.dss =0 ;#endif }
include/net/mptcp.h +7 -0
@@ -33,6 +33,13 @@ struct mptcp_out_options {u16 suboptions;u64 sndr_key;u64 rcvr_key; +union { +struct in_addr addr; +#if IS_ENABLED (CONFIG_MPTCP_IPV6 ) +struct in6_addr addr6; +#endif + }; +u8 addr_id;struct mptcp_ext ext_copy;#endif };
net/mptcp/options.c +113 -8
163 lines not on this page · raw message
net/mptcp/protocol.h +17 -0
@@ -17,6 +17,9 @@#define OPTION_MPTCP_MPC_SYN BIT(0)#define OPTION_MPTCP_MPC_SYNACK BIT(1)#define OPTION_MPTCP_MPC_ACK BIT(2) +#define OPTION_MPTCP_ADD_ADDR BIT(6) +#define OPTION_MPTCP_ADD_ADDR6 BIT(7) +#define OPTION_MPTCP_RM_ADDR BIT(8)/* MPTCP option subtypes */ #define MPTCPOPT_MP_CAPABLE 0
@@ -39,6 +42,9 @@#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/* MPTCP MP_CAPABLE flags */ #define MPTCP_VERSION_MASK (0x0F)
@@ -55,10 +61,21 @@#define MPTCP_DSS_HAS_ACK BIT(0)#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 +/* MPTCP socket flags */ #define MPTCP_DATA_READY 0#define MPTCP_SEND_SPACE 1 +static inline __be32 mptcp_option (u8 subopt,u8 len,u8 nib,u8 field) +{ +return htonl ((TCPOPT_MPTCP <<24 ) | (len <<16 ) | (subopt <<12 ) | + ((nib &0xF ) <<8 ) | field); +} +/* MPTCP connection sock */ struct mptcp_sock {/* inet_connection_sock must be the first member */
Signature · 1 line
2.17.2
Peter Krystad
PATCH v3 2/5 mptcp: Re-factor mptcp_crypto_hmac_sha()
In reply to Peter KrystadAllow it to take variable-length messages so that v1 ADD_ADDR option processing may also use it.
squashto: Add ADD_ADDR handling
--- net/mptcp/crypto.c | 17 +++++++++++------ net/mptcp/protocol.h | 3 +-- 2 files changed, 12 insertions(+), 8 deletions(-)
net/mptcp/crypto.c +11 -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 ];
@@ -55,6 +54,9 @@ void mptcp_crypto_hmac_sha(u64 key1, u64 key2, u32 nonce1, u32 nonce2,u8 key2be[8 ];int i; +if (WARN_ON_ONCE (len >SHA256_DIGEST_SIZE )) + len =SHA256_DIGEST_SIZE ; +put_unaligned_be64 (key1, key1be);put_unaligned_be64 (key2, key2be);
@@ -65,11 +67,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 +126,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 +136,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
@@ -236,8 +236,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);static inline struct mptcp_ext *mptcp_get_ext (struct sk_buff *skb) {
Signature · 1 line
2.17.2
Peter Krystad
PATCH v3 3/5 mptcp: v1 ADD_ADDR changes: add_addr_hmac_valid
In reply to Peter KrystadValidate incoming ADD_ADDR options
squash-to: Add path manager interface
--- net/mptcp/options.c | 31 ++++++++++++++++++++++++++++--- net/mptcp/protocol.h | 4 ++-- 2 files changed, 30 insertions(+), 5 deletions(-)
net/mptcp/options.c +28 -3
@@ -439,7 +439,7 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb,static u64 add_addr_generate_hmac (u64 key1,u64 key2,u8 addr_id,struct in_addr *addr) { -u8 hmac[MPTCPOPT_HMAC_LEN ]; +u8 hmac[MPTCP_ADDR_HMAC_LEN ];u8 msg[7 ]; msg[0 ] = addr_id;
@@ -455,7 +455,7 @@ static u64 add_addr_generate_hmac(u64 key1, u64 key2, u8 addr_id,static u64 add_addr6_generate_hmac (u64 key1,u64 key2,u8 addr_id,struct in6_addr *addr) { -u8 hmac[MPTCPOPT_HMAC_LEN ]; +u8 hmac[MPTCP_ADDR_HMAC_LEN ];u8 msg[19 ]; msg[0 ] = addr_id;
@@ -592,6 +592,30 @@ static bool check_fourth_ack(struct mptcp_subflow_context *subflow,return true; } +static bool add_addr_hmac_valid (struct mptcp_subflow_context *subflow, +struct mptcp_options_received *mp_opt) +{ +u64 hmac; + +if (mp_opt->echo) +return true; + +if (mp_opt->family ==MPTCP_ADDR_IPVERSION_4 ) + hmac =add_addr_generate_hmac (subflow->remote_key, + subflow->local_key, + mp_opt->addr_id, &mp_opt->addr); +else + hmac =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 )hmac, + (unsigned long long )mp_opt->ahmac); + +return hmac == mp_opt->ahmac; +} +void mptcp_incoming_options (struct sock *sk,struct sk_buff *skb,struct tcp_options_received *opt_rx) {
@@ -604,7 +628,8 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb,if (!check_fourth_ack (subflow, skb, mp_opt))return ; -if (msk && mp_opt->add_addr) { +if (msk && mp_opt->add_addr && + !mp_opt->echo &&add_addr_hmac_valid (subflow, mp_opt)) {struct mptcp_addr_info addr; addr.port =0 ;
net/mptcp/protocol.h +2 -2
@@ -53,8 +53,6 @@#define TCPOLEN_MPTCP_PORT_LEN 2#define TCPOLEN_MPTCP_RM_ADDR_BASE 4 -#define MPTCPOPT_HMAC_LEN 20 -/* MPTCP MP_CAPABLE flags */ #define MPTCP_VERSION_MASK (0x0F)#define MPTCP_CAP_CHECKSUM_REQD BIT(7)
@@ -72,9 +70,11 @@/* MPTCP ADD_ADDR flags */ #define MPTCP_ADDR_ECHO BIT(0) +#define MPTCP_ADDR_HMAC_LEN 20#define MPTCP_ADDR_IPVERSION_4 4#define MPTCP_ADDR_IPVERSION_6 6 +/* MPTCP socket flags */ #define MPTCP_DATA_READY 0#define MPTCP_SEND_SPACE 1
Signature · 1 line
2.17.2
Peter Krystad
PATCH v3 4/5 mptcp: v1 ADD_ADDR changes: add subflow_generate_hmac()
In reply to Peter KrystadAdd subflow_generate_hmac() to generate hmac from nonces.
squash-to: Add handling of incoming MP_JOIN requests
--- net/mptcp/subflow.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
net/mptcp/subflow.c +15 -4
@@ -48,6 +48,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 , 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)
@@ -73,9 +84,9 @@ 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); + subflow_req->remote_nonce, hmac); subflow_req->thmac =get_unaligned_be64 (hmac);
@@ -238,9 +249,9 @@ 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); + subflow_req->local_nonce, hmac); ret = true;if (crypto_memneq (hmac, rx_opt->mptcp.hmac,sizeof (hmac)))
Signature · 1 line
2.17.2
Peter Krystad
PATCH v3 5/5 mptcp: v1 ADD_ADDR changes: use subflow_generate_hmac()
In reply to Peter KrystadUse subflow_generate_hmac() to create hmac from nonces.
squash-to: Add handling of outgoing MP_JOIN requests
--- net/mptcp/subflow.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/mptcp/subflow.c +4 -4
@@ -194,9 +194,9 @@ 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); + hmac); thmac =get_unaligned_be64 (hmac); pr_debug("subflow=%p, token=%u, thmac=%llu, subflow->thmac=%llu\n",
@@ -238,10 +238,10 @@ 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); + subflow->hmac);if (skb) subflow->ssn_offset =TCP_SKB_CB (skb)->seq;
Signature · 1 line
2.17.2
Paolo Abeni
[MPTCP] Re: [PATCH v3 1/5] mptcp: Add ADD_ADDR handling
In reply to Peter KrystadHi Peter,
Quoted 6 lines · Peter Krystad
Add handling for sending and receiving the
ADD_ADDR,ADD_ADDR6, andRM_ADDRsuboptions.squashto: Add
ADD_ADDRhandlingSigned-off-by Peter Krystad <peter.krystad(a)linux.intel.com>
This looks like the current "mptcp: Add ADD_ADDR handling" patch, unmodified ?!? Am I missing something ?!?
The other patches LGTM,
Thanks,
Paolo
Peter Krystad
[MPTCP] Re: [PATCH v3 1/5] mptcp: Add ADD_ADDR handling
Quoted 6 lines · Paolo Abeni
Hi Peter,
Quoted 3 lines · Peter Krystad
Add handling for sending and receiving the
ADD_ADDR,ADD_ADDR6, andRM_ADDRsuboptions.
Quoted 6 lines
Quoted 3 lines
squashto: Add
ADD_ADDRhandlingSigned-off-by Peter Krystad <peter.krystad(a)linux.intel.com>This looks like the current "mptcp: Add
ADD_ADDRhandling" patch, unmodified ?!? Am I missing something ?!?
My mistake, dyslexia with format-patch direction, new set coming.
Peter.
Quoted 7 lines
The other patches LGTM,
Thanks,
Paolo