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

[Jon M. <jm...@re...>]

On 11/24/21 15:28, Xin Long 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 <luc...@gm...>
> ---
>   net/tipc/link.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> 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;
>   		}
Acked-by: Jon Maloy <jm...@re...>