github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 21:45:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net/tls: Check for errors in tls_device_init

Browse Source 
[ Upstream commit 3d8c51b25a ]

Add missing error checks in tls_device_init.

Fixes: e8f6979981 ("net/tls: Add generic NIC offload infrastructure")
Reported-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Maxim Mikityanskiy <maximmi@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://lore.kernel.org/r/20220714070754.1428-1-tariqt@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Tariq Toukan 2022-07-14 10:07:54 +03:00 committed by Greg Kroah-Hartman
parent eb58fd350a
commit c713de1d80
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/tls.h
View File

@ -707,7 +707,7 @@ int tls_sw_fallback_init(struct sock *sk,
struct tls_crypto_info *crypto_info); struct tls_crypto_info *crypto_info);
#ifdef CONFIG_TLS_DEVICE #ifdef CONFIG_TLS_DEVICE
void tls_device_init(void); int tls_device_init(void);
void tls_device_cleanup(void); void tls_device_cleanup(void);
void tls_device_sk_destruct(struct sock *sk); void tls_device_sk_destruct(struct sock *sk);
int tls_set_device_offload(struct sock *sk, struct tls_context *ctx); int tls_set_device_offload(struct sock *sk, struct tls_context *ctx);
@ -727,7 +727,7 @@ static inline bool tls_is_sk_rx_device_offloaded(struct sock *sk)
return tls_get_ctx(sk)->rx_conf == TLS_HW; return tls_get_ctx(sk)->rx_conf == TLS_HW;
} }
#else #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 void tls_device_cleanup(void) {}
static inline int static inline int

4
net/tls/tls_device.c
View File

@ -1390,9 +1390,9 @@ static struct notifier_block tls_dev_notifier = {
.notifier_call = tls_dev_event, .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) void __exit tls_device_cleanup(void)

7
net/tls/tls_main.c
View File

@ -905,7 +905,12 @@ static int __init tls_register(void)
if (err) if (err)
return 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); tcp_register_ulp(&tcp_tls_ulp_ops);
return 0; return 0;