[net-next] tipc: discard MSG_CRYPTO msgs when key_exchange_enabled is not set

Commit Message

Xin Long Dec. 10, 2021, 6:50 p.m. UTC

When key_exchange is disabled, there is no reason to accept MSG_CRYPTO
msgs if it doesn't send MSG_CRYPTO msgs.

Signed-off-by: Xin Long <[e-mail]>
Acked-by: Jon Maloy <[e-mail]>
---
 net/tipc/link.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

[e-mail] Dec. 13, 2021, 12:40 p.m. UTC | #1

Hello:

This patch was applied to netdev/net-next.git (master)
by David S. Miller <[e-mail]>:

On Fri, 10 Dec 2021 13:50:40 -0500 you wrote:
> When key_exchange is disabled, there is no reason to accept MSG_CRYPTO
> msgs if it doesn't send MSG_CRYPTO msgs.
> 
> Signed-off-by: Xin Long <[e-mail]>
> Acked-by: Jon Maloy <[e-mail]>
> ---
>  net/tipc/link.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Here is the summary with links:
  - [net-next] tipc: discard MSG_CRYPTO msgs when key_exchange_enabled is not set
    https://git.kernel.org/netdev/net-next/c/6180c780e64c

You are awesome, thank you!

Patch

diff --git a/net/tipc/link.c b/net/tipc/link.c
index 09ae8448f394..8d9e09f48f4c 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1298,7 +1298,8 @@  static bool tipc_data_input(struct tipc_link *l, struct sk_buff *skb,
 		return false;
 #ifdef CONFIG_TIPC_CRYPTO
 	case MSG_CRYPTO:
-		if (TIPC_SKB_CB(skb)->decrypted) {
+		if (sysctl_tipc_key_exchange_enabled &&
+		    TIPC_SKB_CB(skb)->decrypted) {
 			tipc_crypto_msg_rcv(l->net, skb);
 			return true;
 		}