Commit ac78fc14 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Daniel Borkmann
Browse files

net/tls: don't call tls_sk_proto_close for hw record offload 



The deprecated TOE offload doesn't actually do anything in
tls_sk_proto_close() - all TLS code is skipped and context
not freed. Remove the callback to make it easier to refactor
tls_sk_proto_close().

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarDirk van der Merwe <dirk.vandermerwe@netronome.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 318892ac

net/tls/tls_main.c

+0 −4
Original line number Diff line number Diff line
@@ -271,9 +271,6 @@ static void tls_sk_proto_close(struct sock *sk, long timeout) 
	lock_sock(sk);

	sk_proto_close = ctx->sk_proto_close;



	if (ctx->tx_conf == TLS_HW_RECORD && ctx->rx_conf == TLS_HW_RECORD)

		goto skip_tx_cleanup;



	if (ctx->tx_conf == TLS_BASE && ctx->rx_conf == TLS_BASE) {

		free_ctx = true;

		goto skip_tx_cleanup;
@@ -766,7 +763,6 @@ static void build_protos(struct proto prot[TLS_NUM_CONFIG][TLS_NUM_CONFIG], 
	prot[TLS_HW_RECORD][TLS_HW_RECORD] = *base;

	prot[TLS_HW_RECORD][TLS_HW_RECORD].hash		= tls_hw_hash;

	prot[TLS_HW_RECORD][TLS_HW_RECORD].unhash	= tls_hw_unhash;

	prot[TLS_HW_RECORD][TLS_HW_RECORD].close	= tls_sk_proto_close;

}



static int tls_init(struct sock *sk)

CRA Git | Maintained and supported by SUSTech CRA and CCSE