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 /include | |
| parent | 965931e3a803a506482616f89239eff6901c17b8 (diff) | |
| parent | 585f5a6252ee43ec8feeee07387e3fcc7e8bb292 (diff) | |
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 'include')
| -rw-r--r-- | include/net/tcp.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index d196901c9dba..770917d0caa7 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -2065,6 +2065,10 @@ int tcp_set_ulp_id(struct sock *sk, const int ulp); void tcp_get_available_ulp(char *buf, size_t len); void tcp_cleanup_ulp(struct sock *sk); +#define MODULE_ALIAS_TCP_ULP(name) \ + __MODULE_INFO(alias, alias_userspace, name); \ + __MODULE_INFO(alias, alias_tcp_ulp, "tcp-ulp-" name) + /* Call BPF_SOCK_OPS program that returns an int. If the return value * is < 0, then the BPF op failed (for example if the loaded BPF * program does not support the chosen operation or there is no BPF |