Skip to content

Commit

Permalink
net/tls: Check for errors in tls_device_init
Browse files Browse the repository at this point in the history
Add missing error checks in tls_device_init.

Fixes: e8f6979 ("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>
  • Loading branch information
Tariq Toukan authored and Jakub Kicinski committed Jul 14, 2022
1 parent 51f1c31 commit 3d8c51b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
4 changes: 2 additions & 2 deletions include/net/tls.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions net/tls/tls_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 6 additions & 1 deletion net/tls/tls_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 3d8c51b

Please sign in to comment.