Commit 3d8c51b2 authored by Tariq Toukan's avatar Tariq Toukan Committed by Jakub Kicinski
Browse files

net/tls: Check for errors in tls_device_init 



Add missing error checks in tls_device_init.

Fixes: e8f69799 ("net/tls: Add generic NIC offload infrastructure")
Reported-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarMaxim Mikityanskiy <maximmi@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Link: https://lore.kernel.org/r/20220714070754.1428-1-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 51f1c31f

include/net/tls.h

+2 −2
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ int tls_sw_fallback_init(struct sock *sk, 
			 struct tls_crypto_info *crypto_info);



#ifdef CONFIG_TLS_DEVICE

void tls_device_init(void);

int tls_device_init(void);

void tls_device_cleanup(void);

void tls_device_sk_destruct(struct sock *sk);

int tls_set_device_offload(struct sock *sk, struct tls_context *ctx);
@@ -724,7 +724,7 @@ static inline bool tls_is_sk_rx_device_offloaded(struct sock *sk) 
	return tls_get_ctx(sk)->rx_conf == TLS_HW;

}

#else

static inline void tls_device_init(void) {}

static inline int tls_device_init(void) { return 0; }

static inline void tls_device_cleanup(void) {}



static inline int

net/tls/tls_device.c

+2 −2
Original line number Diff line number Diff line
@@ -1419,9 +1419,9 @@ static struct notifier_block tls_dev_notifier = { 
	.notifier_call	= tls_dev_event,

};



void __init tls_device_init(void)

int __init tls_device_init(void)

{

	register_netdevice_notifier(&tls_dev_notifier);

	return register_netdevice_notifier(&tls_dev_notifier);

}



void __exit tls_device_cleanup(void)

net/tls/tls_main.c

+6 −1
Original line number Diff line number Diff line
@@ -1048,7 +1048,12 @@ static int __init tls_register(void) 
	if (err)

		return err;



	tls_device_init();

	err = tls_device_init();

	if (err) {

		unregister_pernet_subsys(&tls_proc_ops);

		return err;

	}



	tcp_register_ulp(&tcp_tls_ulp_ops);



	return 0;