net/tls: Check for errors in tls_device_init
Subsystems (3)
PATCH 1/1 net/tls: Check for errors in tls_device_init
Add missing error checks in tls_device_init.
Fixes e8f69799810c ("net/tls: Add generic NIC offload infrastructure")
Reported-by Jakub Kicinski <[email protected]>
Reviewed-by Maxim Mikityanskiy <[email protected]>
Signed-off-by Tariq Toukan <[email protected]>
--- include/net/tls.h | 4 ++-- net/tls/tls_device.c | 4 ++-- net/tls/tls_main.c | 7 ++++++- 3 files changed, 10 insertions(+), 5 deletions(-)
Patch conflicts with header movements done in net-next:
587903142308 tls: create an internal header
Resolution is trivial.
Thanks,
Tariq
include/net/tls.h +2 -2
@@ -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
@@ -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
@@ -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 ;
Signature · 1 line
2.21.0
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Thu, 14 Jul 2022 10:07:54 +0300 you wrote:
Add missing error checks in
tls_device_init.Fixes e8f69799810c ("net/tls: Add generic NIC offload infrastructure")Reported-by Jakub Kicinski <[email protected]>Reviewed-by Maxim Mikityanskiy <[email protected]>Signed-off-by Tariq Toukan <[email protected]>[...]
Here is the summary with links:
- [net] net/tls: Check for errors in tls_device_init
https://git.kernel.org/netdev/net/c/3d8c51b25a23
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html