mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-03 18:20:25 +02:00 
			
		
		
		
	net/tls: Check for errors in tls_device_init
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>
			
			
This commit is contained in:
		
							parent
							
								
									51f1c31f8b
								
							
						
					
					
						commit
						3d8c51b25a
					
				
					 3 changed files with 10 additions and 5 deletions
				
			
		| 
						 | 
					@ -704,7 +704,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);
 | 
				
			||||||
| 
						 | 
					@ -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;
 | 
						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
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1419,9 +1419,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)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1048,7 +1048,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;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue