Skip to contentSkip to conversation

mptcp: simplify crypto.c

PATCH Superseded Davide Caratti 4 participants 7 messages Jul 11, 2019 – Jul 23, 2019

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Davide Caratti

author
#0 lore raw

cover mptcp: simplify crypto.c

his series wants to simplify, and hopefully improve, random generation of keys and nonces in crypto.c, While at it, I removed some unneeded #includes on top of the file. Any feedbacks are welcome!

Note:
in case you think the code is ok, I will propose to squash it into commit 34f09d53931a ("mptcp: Add key generation and token tree")

Changes since RFC:
- use get_random_bytes() instead of siphash, thanks to Florian / Mat

Davide Caratti (2):
net: mptcp: remove useless #includes in crypto.c
net: mptcp: randomness improvements for crypto.c

 net/mptcp/crypto.c   | 77 +-------------------------------------------
 net/mptcp/protocol.c |  1 -
 net/mptcp/protocol.h | 11 -------
 net/mptcp/token.c    | 49 +++-------------------------
 4 files changed, 5 insertions(+), 133 deletions(-)
Signature · 1 line
2.20.1
author
#1 lore raw

PATCH 1/2 net: mptcp: remove useless #includes in crypto.c

- crypto.c doesn't need module.h (that was included twice)
- crypto.c does'nt need netdevice.h
- remove duplicate include of kernel.h

Signed-off-by Davide Caratti <dcaratti(a)redhat.com>
---
 net/mptcp/crypto.c | 4 ----
 1 file changed, 4 deletions(-)
net/mptcp/crypto.c +0 -4
index 26a68aa1933a..e8644590690f 100644
@@ -21,10 +21,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/netdevice.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/cryptohash.h>
 #include <linux/random.h>
 #include <linux/siphash.h>
Signature · 1 line
2.20.1
author
#2 lore raw

PATCH 2/2 net: mptcp: randomness improvements for crypto.c

In reply to Davide Caratti

use get_random_bytes(), instead of siphash, for MPTCP keys and nonces. This should improve MPTCP key/nonce randomness, because seeds are no more initialized at a fixed time during the boot process, and we also get rid of 'static u32 crypto_seed' (that can theoretically clash in case sockets were requesting the key from different namespaces).

CC Mat Martineau <mathew.j.martineau(a)linux.intel.com>
CC Florian Westphal <fwestpha(a)redhat.com>
CC Paolo Abeni <pabeni(a)redhat.com>
Signed-off-by Davide Caratti <dcaratti(a)redhat.com>
---
 net/mptcp/crypto.c   | 73 +-------------------------------------------
 net/mptcp/protocol.c |  1 -
 net/mptcp/protocol.h | 11 -------
 net/mptcp/token.c    | 49 +++--------------------------
 4 files changed, 5 insertions(+), 129 deletions(-)
net/mptcp/crypto.c +1 -72
index e8644590690f..843bf1b5c4d9 100644
@@ -24,71 +24,9 @@
 #include <linux/cryptohash.h>
 #include <linux/random.h>
 #include <linux/siphash.h>
+#include <net/tcp.h>
 #include <asm/unaligned.h>
 
-static siphash_key_t crypto_key_secret __read_mostly;
-static hsiphash_key_t crypto_nonce_secret __read_mostly;
-static u32 crypto_seed;
-
-u32 crypto_v4_get_nonce(__be32 saddr, __be32 daddr, __be16 sport, __be16 dport)
-{
-	return hsiphash_4u32((__force u32)saddr, (__force u32)daddr,
-			    (__force u32)sport << 16 | (__force u32)dport,
-			    crypto_seed++, &crypto_nonce_secret);
-}
-
-u64 crypto_v4_get_key(__be32 saddr, __be32 daddr, __be16 sport, __be16 dport)
-{
-	pr_debug("src=%x:%d, dst=%x:%d", saddr, sport, daddr, dport);
-	return siphash_4u32((__force u32)saddr, (__force u32)daddr,
-			    (__force u32)sport << 16 | (__force u32)dport,
-			    crypto_seed++, &crypto_key_secret);
-}
-
-u32 crypto_v6_get_nonce(const struct in6_addr *saddr,
-			const struct in6_addr *daddr,
-			__be16 sport, __be16 dport)
-{
-	const struct {
-		struct in6_addr saddr;
-		struct in6_addr daddr;
-		u32 seed;
-		__be16 sport;
-		__be16 dport;
-	} __aligned(SIPHASH_ALIGNMENT) combined = {
-		.saddr = *saddr,
-		.daddr = *daddr,
-		.seed = crypto_seed++,
-		.sport = sport,
-		.dport = dport,
-	};
-
-	return hsiphash(&combined, offsetofend(typeof(combined), dport),
-			&crypto_nonce_secret);
-}
-
-u64 crypto_v6_get_key(const struct in6_addr *saddr,
-		      const struct in6_addr *daddr,
-		      __be16 sport, __be16 dport)
-{
-	const struct {
-		struct in6_addr saddr;
-		struct in6_addr daddr;
-		u32 seed;
-		__be16 sport;
-		__be16 dport;
-	} __aligned(SIPHASH_ALIGNMENT) combined = {
-		.saddr = *saddr,
-		.daddr = *daddr,
-		.seed = crypto_seed++,
-		.sport = sport,
-		.dport = dport,
-	};
-
-	return siphash(&combined, offsetofend(typeof(combined), dport),
-		       &crypto_key_secret);
-}
-
 void crypto_key_sha1(u64 key, u32 *token, u64 *idsn)
 {
 	u32 workspace[SHA_WORKSPACE_WORDS];
@@ -191,12 +129,3 @@ void crypto_hmac_sha1(u64 key1, u64 key2, u32 *hash_out,
 	for (i = 0; i < 5; i++)
 		hash_out[i] = (__force u32)cpu_to_be32(hash_out[i]);
 }
-
-void crypto_init(void)
-{
-	get_random_bytes((void *)&crypto_key_secret,
-			 sizeof(crypto_key_secret));
-	get_random_bytes((void *)&crypto_nonce_secret,
-			 sizeof(crypto_nonce_secret));
-	crypto_seed = 0;
-}
net/mptcp/protocol.c +0 -1
index 774ed25d3b6d..7347da1e7a39 100644
@@ -1006,7 +1006,6 @@ void __init mptcp_init(void)
 	mptcp_stream_ops.shutdown = mptcp_shutdown;
 
 	token_init();
-	crypto_init();
 	subflow_init();
 
 	if (proto_register(&mptcp_prot, 1) != 0)
net/mptcp/protocol.h +0 -11
index 7f15f6aab93d..1997fa69981f 100644
@@ -207,17 +207,6 @@ void token_update_accept(struct sock *sk, struct sock *conn);
 void token_release(u32 token);
 void token_destroy(u32 token);
 
-void crypto_init(void);
-u32 crypto_v4_get_nonce(__be32 saddr, __be32 daddr,
-			__be16 sport, __be16 dport);
-u64 crypto_v4_get_key(__be32 saddr, __be32 daddr,
-		      __be16 sport, __be16 dport);
-u64 crypto_v6_get_key(const struct in6_addr *saddr,
-		      const struct in6_addr *daddr,
-		      __be16 sport, __be16 dport);
-u32 crypto_v6_get_nonce(const struct in6_addr *saddr,
-			const struct in6_addr *daddr,
-			__be16 sport, __be16 dport);
 void crypto_key_sha1(u64 key, u32 *token, u64 *idsn);
 void crypto_hmac_sha1(u64 key1, u64 key2, u32 *hash_out,
 		      int arg_num, ...);
net/mptcp/token.c +4 -45

68 lines not on this page · raw message

Signature · 1 line
2.20.1
#3 lore raw

Re: [MPTCP] [PATCH 2/2] net: mptcp: randomness improvements for crypto.c

Quoted 22 lines · Davide Caratti

use get_random_bytes(), instead of siphash, for MPTCP keys and nonces. This should improve MPTCP key/nonce randomness, because seeds are no more initialized at a fixed time during the boot process, and we also get rid of 'static u32 crypto_seed' (that can theoretically clash in case sockets were requesting the key from different namespaces).

CC Mat Martineau <mathew.j.martineau(a)linux.intel.com>
CC Florian Westphal <fwestpha(a)redhat.com>
CC Paolo Abeni <pabeni(a)redhat.com>
Signed-off-by Davide Caratti <dcaratti(a)redhat.com>

---

net/mptcp/crypto.c   | 73 +-------------------------------------------
net/mptcp/protocol.c |  1 -
net/mptcp/protocol.h | 11 -------
net/mptcp/token.c    | 49 +++--------------------------
4 files changed, 5 insertions(+), 129 deletions(-)
net/mptcp/crypto.c +0 -0
index e8644590690f..843bf1b5c4d9 100644

net/mptcp/crypto.c line 27

Quoted 4 lines
net/mptcp/crypto.c +1 -0
@@ -24,71 +24,9 @@
 #include <linux/cryptohash.h>
 #include <linux/random.h>
 #include <linux/siphash.h>
+#include <net/tcp.h>

I think this header was added for tcp_cookie_time() (in the RFC patch set) and isn't needed now.

The rest of the changes look good.

Mat

Quoted 192 lines
net/mptcp/crypto.c +0 -72
 #include <asm/unaligned.h>
 
-static siphash_key_t crypto_key_secret __read_mostly;
-static hsiphash_key_t crypto_nonce_secret __read_mostly;
-static u32 crypto_seed;
-
-u32 crypto_v4_get_nonce(__be32 saddr, __be32 daddr, __be16 sport, __be16 dport)
-{
-	return hsiphash_4u32((__force u32)saddr, (__force u32)daddr,
-			    (__force u32)sport << 16 | (__force u32)dport,
-			    crypto_seed++, &crypto_nonce_secret);
-}
-
-u64 crypto_v4_get_key(__be32 saddr, __be32 daddr, __be16 sport, __be16 dport)
-{
-	pr_debug("src=%x:%d, dst=%x:%d", saddr, sport, daddr, dport);
-	return siphash_4u32((__force u32)saddr, (__force u32)daddr,
-			    (__force u32)sport << 16 | (__force u32)dport,
-			    crypto_seed++, &crypto_key_secret);
-}
-
-u32 crypto_v6_get_nonce(const struct in6_addr *saddr,
-			const struct in6_addr *daddr,
-			__be16 sport, __be16 dport)
-{
-	const struct {
-		struct in6_addr saddr;
-		struct in6_addr daddr;
-		u32 seed;
-		__be16 sport;
-		__be16 dport;
-	} __aligned(SIPHASH_ALIGNMENT) combined = {
-		.saddr = *saddr,
-		.daddr = *daddr,
-		.seed = crypto_seed++,
-		.sport = sport,
-		.dport = dport,
-	};
-
-	return hsiphash(&combined, offsetofend(typeof(combined), dport),
-			&crypto_nonce_secret);
-}
-
-u64 crypto_v6_get_key(const struct in6_addr *saddr,
-		      const struct in6_addr *daddr,
-		      __be16 sport, __be16 dport)
-{
-	const struct {
-		struct in6_addr saddr;
-		struct in6_addr daddr;
-		u32 seed;
-		__be16 sport;
-		__be16 dport;
-	} __aligned(SIPHASH_ALIGNMENT) combined = {
-		.saddr = *saddr,
-		.daddr = *daddr,
-		.seed = crypto_seed++,
-		.sport = sport,
-		.dport = dport,
-	};
-
-	return siphash(&combined, offsetofend(typeof(combined), dport),
-		       &crypto_key_secret);
-}
-
 void crypto_key_sha1(u64 key, u32 *token, u64 *idsn)
 {
 	u32 workspace[SHA_WORKSPACE_WORDS];
@@ -191,12 +129,3 @@ void crypto_hmac_sha1(u64 key1, u64 key2, u32 *hash_out,
 	for (i = 0; i < 5; i++)
 		hash_out[i] = (__force u32)cpu_to_be32(hash_out[i]);
 }
-
-void crypto_init(void)
-{
-	get_random_bytes((void *)&crypto_key_secret,
-			 sizeof(crypto_key_secret));
-	get_random_bytes((void *)&crypto_nonce_secret,
-			 sizeof(crypto_nonce_secret));
-	crypto_seed = 0;
-}
net/mptcp/protocol.c +0 -1
index 774ed25d3b6d..7347da1e7a39 100644
@@ -1006,7 +1006,6 @@ void __init mptcp_init(void)
 	mptcp_stream_ops.shutdown = mptcp_shutdown;
 
 	token_init();
-	crypto_init();
 	subflow_init();
 
 	if (proto_register(&mptcp_prot, 1) != 0)
net/mptcp/protocol.h +0 -11
index 7f15f6aab93d..1997fa69981f 100644
@@ -207,17 +207,6 @@ void token_update_accept(struct sock *sk, struct sock *conn);
 void token_release(u32 token);
 void token_destroy(u32 token);
 
-void crypto_init(void);
-u32 crypto_v4_get_nonce(__be32 saddr, __be32 daddr,
-			__be16 sport, __be16 dport);
-u64 crypto_v4_get_key(__be32 saddr, __be32 daddr,
-		      __be16 sport, __be16 dport);
-u64 crypto_v6_get_key(const struct in6_addr *saddr,
-		      const struct in6_addr *daddr,
-		      __be16 sport, __be16 dport);
-u32 crypto_v6_get_nonce(const struct in6_addr *saddr,
-			const struct in6_addr *daddr,
-			__be16 sport, __be16 dport);
 void crypto_key_sha1(u64 key, u32 *token, u64 *idsn);
 void crypto_hmac_sha1(u64 key1, u64 key2, u32 *hash_out,
 		      int arg_num, ...);
net/mptcp/token.c +4 -45
index c2f4fcb37566..9c0fe5caaf1e 100644
@@ -68,22 +68,8 @@ static void new_req_token(struct request_sock *req,
 {
 	const struct inet_request_sock *ireq = inet_rsk(req);
 	struct subflow_request_sock *subflow_req = subflow_rsk(req);
-	u64 local_key;
-
-	if (!IS_ENABLED(CONFIG_IPV6) || skb->protocol == htons(ETH_P_IP)) {
-		local_key = crypto_v4_get_key(ip_hdr(skb)->saddr,
-					      ip_hdr(skb)->daddr,
-					      htons(ireq->ir_num),
-					      ireq->ir_rmt_port);
-#if IS_ENABLED(CONFIG_IPV6)
-	} else {
-		local_key = crypto_v6_get_key(&ipv6_hdr(skb)->saddr,
-					      &ipv6_hdr(skb)->daddr,
-					      htons(ireq->ir_num),
-					      ireq->ir_rmt_port);
-#endif
-	}
-	subflow_req->local_key = local_key;
+
+	get_random_bytes(&subflow_req->local_key, sizeof(u64));
 	crypto_key_sha1(subflow_req->local_key, &subflow_req->token,
 			&subflow_req->idsn);
 	pr_debug("local_key=%llu, token=%u, idsn=%llu", subflow_req->local_key,
@@ -97,23 +83,8 @@ static void new_req_join(struct request_sock *req, struct sock *sk,
 	struct subflow_request_sock *subflow_req = subflow_rsk(req);
 	struct mptcp_sock *msk = mptcp_sk(sk);
 	u8 hmac[MPTCPOPT_HMAC_LEN];
-	u32 nonce;
-
-	if (skb->protocol == htons(ETH_P_IP)) {
-		nonce = crypto_v4_get_nonce(ip_hdr(skb)->saddr,
-					    ip_hdr(skb)->daddr,
-					    htons(ireq->ir_num),
-					    ireq->ir_rmt_port);
-#if IS_ENABLED(CONFIG_IPV6)
-	} else {
-		nonce = crypto_v6_get_nonce(&ipv6_hdr(skb)->saddr,
-					    &ipv6_hdr(skb)->daddr,
-					    htons(ireq->ir_num),
-					    ireq->ir_rmt_port);
-#endif
-	}
-	subflow_req->local_nonce = nonce;
 
+	get_random_bytes(&subflow_req->local_nonce, sizeof(u32));
 	crypto_hmac_sha1(msk->local_key,
 			 msk->remote_key,
 			 (u32 *)hmac, 2,
@@ -145,19 +116,7 @@ static void new_token(const struct sock *sk)
 	struct subflow_context *subflow = subflow_ctx(sk);
 	const struct inet_sock *isk = inet_sk(sk);
 
-	if (sk->sk_family == AF_INET) {
-		subflow->local_key = crypto_v4_get_key(isk->inet_saddr,
-						       isk->inet_daddr,
-						       isk->inet_sport,
-						       isk->inet_dport);
-#if IS_ENABLED(CONFIG_IPV6)
-	} else {
-		subflow->local_key = crypto_v6_get_key(&inet6_sk(sk)->saddr,
-						       &sk->sk_v6_daddr,
-						       isk->inet_sport,
-						       isk->inet_dport);
-#endif
-	}
+	get_random_bytes(&subflow->local_key, sizeof(u64));
 	crypto_key_sha1(subflow->local_key, &subflow->token, &subflow->idsn);
 	pr_debug("local_key=%llu, token=%u, idsn=%llu", subflow->local_key,
 		 subflow->token, subflow->idsn);
Signature · 1 line
2.20.1

--
Mat Martineau
Intel

#4 lore raw

Re: [MPTCP] [PATCH 2/2] net: mptcp: randomness improvements for crypto.c

In reply to Davide Caratti

Hi Davide,

Quoted 16 lines · Davide Caratti

use get_random_bytes(), instead of siphash, for MPTCP keys and nonces. This should improve MPTCP key/nonce randomness, because seeds are no more initialized at a fixed time during the boot process, and we also get rid of 'static u32 crypto_seed' (that can theoretically clash in case sockets were requesting the key from different namespaces).

CC Mat Martineau <mathew.j.martineau(a)linux.intel.com>
CC Florian Westphal <fwestpha(a)redhat.com>
CC Paolo Abeni <pabeni(a)redhat.com>
Signed-off-by Davide Caratti <dcaratti(a)redhat.com>
---
 net/mptcp/crypto.c   | 73 +-------------------------------------------
 net/mptcp/protocol.c |  1 -
 net/mptcp/protocol.h | 11 -------
 net/mptcp/token.c    | 49 +++--------------------------
 4 files changed, 5 insertions(+), 129 deletions(-)

(...)

Quoted 16 lines
net/mptcp/token.c +0 -8
index c2f4fcb37566..9c0fe5caaf1e 100644
@@ -68,22 +68,8 @@ static void new_req_token(struct request_sock *req,
 {
 	const struct inet_request_sock *ireq = inet_rsk(req);
 	struct subflow_request_sock *subflow_req = subflow_rsk(req);
-	u64 local_key;
-
-	if (!IS_ENABLED(CONFIG_IPV6) || skb->protocol == htons(ETH_P_IP)) {
-		local_key = crypto_v4_get_key(ip_hdr(skb)->saddr,
-					      ip_hdr(skb)->daddr,
-					      htons(ireq->ir_num),
-					      ireq->ir_rmt_port);
-#if IS_ENABLED(CONFIG_IPV6)

net/mptcp/token.c static void new_req_token(struct request_sock *req, · line 72

Quoted 10 lines
net/mptcp/token.c +2 -8
-	} else {
-		local_key = crypto_v6_get_key(&ipv6_hdr(skb)->saddr,
-					      &ipv6_hdr(skb)->daddr,
-					      htons(ireq->ir_num),
-					      ireq->ir_rmt_port);
-#endif
-	}
-	subflow_req->local_key = local_key;
+
+	get_random_bytes(&subflow_req->local_key, sizeof(u64));

May you add a comment here (and maybe also below) mentioning that this is enough for the moment but a hash with the right info might be interesting to do as an optimisation for later? We briefly discussed about that at the last meeting.

Just to know if I can apply the current version after having removed the #include mentioned by Mat or if I should wait :)

Cheers,
Matt

Signature · 5 lines
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
author
#5 lore raw

Re: [MPTCP] [PATCH 2/2] net: mptcp: randomness improvements for crypto.c

Quoted 10 lines · Matthieu Baerts

Hi Davide,

May you add a comment here (and maybe also below) mentioning that this is enough for the moment but a hash with the right info might be interesting to do as an optimisation for later? We briefly discussed about that at the last meeting.

Just to know if I can apply the current version after having removed the #include mentioned by Mat or if I should wait :)

please wait, I'm just... slow :)
I will respin v2 today.

thanks,

Signature · 1 line
davide
#6 lore raw
In reply to Davide Caratti

Looks good to me.

Peter.

Quoted 21 lines · Davide Caratti

his series wants to simplify, and hopefully improve, random generation of keys and nonces in crypto.c, While at it, I removed some unneeded #includes on top of the file. Any feedbacks are welcome!

Note:
in case you think the code is ok, I will propose to squash it into commit 34f09d53931a ("mptcp: Add key generation and token tree")

Changes since RFC:
- use get_random_bytes() instead of siphash, thanks to Florian / Mat

Davide Caratti (2):
net: mptcp: remove useless #includes in crypto.c
net: mptcp: randomness improvements for crypto.c

 net/mptcp/crypto.c   | 77 +-------------------------------------------
 net/mptcp/protocol.c |  1 -
 net/mptcp/protocol.h | 11 -------
 net/mptcp/token.c    | 49 +++-------------------------
 4 files changed, 5 insertions(+), 133 deletions(-)