Skip to content

Commit 3d8c51b

Browse files
Tariq Toukankuba-moo
authored andcommitted
net/tls: Check for errors in tls_device_init
Add missing error checks in tls_device_init. Fixes: e8f6979 ("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]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 51f1c31 commit 3d8c51b

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

include/net/tls.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ int tls_sw_fallback_init(struct sock *sk,
704704
struct tls_crypto_info *crypto_info);
705705

706706
#ifdef CONFIG_TLS_DEVICE
707-
void tls_device_init(void);
707+
int tls_device_init(void);
708708
void tls_device_cleanup(void);
709709
void tls_device_sk_destruct(struct sock *sk);
710710
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)
724724
return tls_get_ctx(sk)->rx_conf == TLS_HW;
725725
}
726726
#else
727-
static inline void tls_device_init(void) {}
727+
static inline int tls_device_init(void) { return 0; }
728728
static inline void tls_device_cleanup(void) {}
729729

730730
static inline int

net/tls/tls_device.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1419,9 +1419,9 @@ static struct notifier_block tls_dev_notifier = {
14191419
.notifier_call = tls_dev_event,
14201420
};
14211421

1422-
void __init tls_device_init(void)
1422+
int __init tls_device_init(void)
14231423
{
1424-
register_netdevice_notifier(&tls_dev_notifier);
1424+
return register_netdevice_notifier(&tls_dev_notifier);
14251425
}
14261426

14271427
void __exit tls_device_cleanup(void)

net/tls/tls_main.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1048,7 +1048,12 @@ static int __init tls_register(void)
10481048
if (err)
10491049
return err;
10501050

1051-
tls_device_init();
1051+
err = tls_device_init();
1052+
if (err) {
1053+
unregister_pernet_subsys(&tls_proc_ops);
1054+
return err;
1055+
}
1056+
10521057
tcp_register_ulp(&tcp_tls_ulp_ops);
10531058

10541059
return 0;

0 commit comments

Comments
 (0)