diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-07-14 14:19:42 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-07-14 15:27:35 -0700 |
| commit | 816cd1688331e0ffa1927889c15e7ed56650a183 (patch) | |
| tree | 30cbcb7d5d4e1dd226fda651f25ca094e54714a0 /net/tls | |
| parent | b126047f43f11f61f1dd64802979765d71795dae (diff) | |
| parent | db886979683a8360ced9b24ab1125ad0c4d2cf76 (diff) | |
| download | linux-816cd1688331e0ffa1927889c15e7ed56650a183.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
include/net/sock.h
310731e2f161 ("net: Fix data-races around sysctl_mem.")
e70f3c701276 ("Revert "net: set SK_MEM_QUANTUM to 4096"")
https://lore.kernel.org/all/20220711120211.7c8b7cba@canb.auug.org.au/
net/ipv4/fib_semantics.c
747c14307214 ("ip: fix dflt addr selection for connected nexthop")
d62607c3fe45 ("net: rename reference+tracking helpers")
net/tls/tls.h
include/net/tls.h
3d8c51b25a23 ("net/tls: Check for errors in tls_device_init")
587903142308 ("tls: create an internal header")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/tls')
| -rw-r--r-- | net/tls/tls.h | 4 | ||||
| -rw-r--r-- | net/tls/tls_device.c | 4 | ||||
| -rw-r--r-- | net/tls/tls_main.c | 7 |
3 files changed, 10 insertions, 5 deletions
diff --git a/net/tls/tls.h b/net/tls/tls.h index 8005ee25157d37..e0ccc96a0850db 100644 --- a/net/tls/tls.h +++ b/net/tls/tls.h @@ -133,7 +133,7 @@ static inline struct tls_msg *tls_msg(struct sk_buff *skb) } #ifdef CONFIG_TLS_DEVICE -void tls_device_init(void); +int tls_device_init(void); void tls_device_cleanup(void); int tls_set_device_offload(struct sock *sk, struct tls_context *ctx); void tls_device_free_resources_tx(struct sock *sk); @@ -143,7 +143,7 @@ void tls_device_rx_resync_new_rec(struct sock *sk, u32 rcd_len, u32 seq); int tls_device_decrypted(struct sock *sk, struct tls_context *tls_ctx, struct sk_buff *skb, struct strp_msg *rxm); #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 diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c index 227b92a3064a74..6f9dff1c11f6f1 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -1420,9 +1420,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) diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index f71b4656811276..9703636cfc60ba 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -1141,7 +1141,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; |