diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2018-08-16 14:58:08 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2018-08-16 14:58:09 -0700 |
| commit | cbb2fb13db3209cf4264aa5f76393a12add91315 (patch) | |
| tree | 336d9a13409cccdc8d2c8f843bae5f62f4a9334b /net | |
| parent | 965931e3a803a506482616f89239eff6901c17b8 (diff) | |
| parent | 585f5a6252ee43ec8feeee07387e3fcc7e8bb292 (diff) | |
| download | linux-cbb2fb13db3209cf4264aa5f76393a12add91315.tar.gz linux-cbb2fb13db3209cf4264aa5f76393a12add91315.tar.bz2 linux-cbb2fb13db3209cf4264aa5f76393a12add91315.zip | |
Merge branch 'sockmap-ulp-fixes'
Daniel Borkmann says:
====================
Batch of various fixes related to BPF sockmap and ULP, including
adding module alias to restrict module requests, races and memory
leaks in sockmap code. For details please refer to the individual
patches. Thanks!
====================
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp_ulp.c | 4 | ||||
| -rw-r--r-- | net/tls/tls_main.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv4/tcp_ulp.c b/net/ipv4/tcp_ulp.c index 622caa4039e0..a5995bb2eaca 100644 --- a/net/ipv4/tcp_ulp.c +++ b/net/ipv4/tcp_ulp.c @@ -51,7 +51,7 @@ static const struct tcp_ulp_ops *__tcp_ulp_find_autoload(const char *name) #ifdef CONFIG_MODULES if (!ulp && capable(CAP_NET_ADMIN)) { rcu_read_unlock(); - request_module("%s", name); + request_module("tcp-ulp-%s", name); rcu_read_lock(); ulp = tcp_ulp_find(name); } @@ -129,6 +129,8 @@ void tcp_cleanup_ulp(struct sock *sk) if (icsk->icsk_ulp_ops->release) icsk->icsk_ulp_ops->release(sk); module_put(icsk->icsk_ulp_ops->owner); + + icsk->icsk_ulp_ops = NULL; } /* Change upper layer protocol for socket */ diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index b09867c8b817..93c0c225ab34 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -45,6 +45,7 @@ MODULE_AUTHOR("Mellanox Technologies"); MODULE_DESCRIPTION("Transport Layer Security Support"); MODULE_LICENSE("Dual BSD/GPL"); +MODULE_ALIAS_TCP_ULP("tls"); enum { TLSV4, |