ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 04:33:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

net: Use umd_cleanup_helper()

Browse Source 
bpfilter_umh_cleanup() is the same function as umd_cleanup_helper().
Drop the redundant function.

Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20230526112104.1044686-1-jarkko@kernel.org
This commit is contained in:
Jarkko Sakkinen
2023-05-26 14:21:02 +03:00
committed by Daniel Borkmann
parent ffadc37252
commit 9b68f30b68
3 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/bpfilter.h
View File

@@ -11,7 +11,6 @@ int bpfilter_ip_set_sockopt(struct sock *sk, int optname, sockptr_t optval,
unsigned int optlen); unsigned int optlen);
int bpfilter_ip_get_sockopt(struct sock *sk, int optname, char __user *optval, int bpfilter_ip_get_sockopt(struct sock *sk, int optname, char __user *optval,
int __user *optlen); int __user *optlen);
void bpfilter_umh_cleanup(struct umd_info *info);
struct bpfilter_umh_ops { struct bpfilter_umh_ops {
struct umd_info info; struct umd_info info;

2
net/bpfilter/bpfilter_kern.c
View File

@@ -21,7 +21,7 @@ static void shutdown_umh(void)
if (tgid) { if (tgid) {
kill_pid(tgid, SIGKILL, 1); kill_pid(tgid, SIGKILL, 1);
wait_event(tgid->wait_pidfd, thread_group_exited(tgid)); wait_event(tgid->wait_pidfd, thread_group_exited(tgid));
bpfilter_umh_cleanup(info); umd_cleanup_helper(info);
} }
} }

11
net/ipv4/bpfilter/sockopt.c
View File

@@ -12,15 +12,6 @@
struct bpfilter_umh_ops bpfilter_ops; struct bpfilter_umh_ops bpfilter_ops;
EXPORT_SYMBOL_GPL(bpfilter_ops); EXPORT_SYMBOL_GPL(bpfilter_ops);
void bpfilter_umh_cleanup(struct umd_info *info)
{
fput(info->pipe_to_umh);
fput(info->pipe_from_umh);
put_pid(info->tgid);
info->tgid = NULL;
}
EXPORT_SYMBOL_GPL(bpfilter_umh_cleanup);
static int bpfilter_mbox_request(struct sock *sk, int optname, sockptr_t optval, static int bpfilter_mbox_request(struct sock *sk, int optname, sockptr_t optval,
unsigned int optlen, bool is_set) unsigned int optlen, bool is_set)
{ {
@@ -38,7 +29,7 @@ static int bpfilter_mbox_request(struct sock *sk, int optname, sockptr_t optval,
} }
if (bpfilter_ops.info.tgid && if (bpfilter_ops.info.tgid &&
thread_group_exited(bpfilter_ops.info.tgid)) thread_group_exited(bpfilter_ops.info.tgid))
bpfilter_umh_cleanup(&bpfilter_ops.info); umd_cleanup_helper(&bpfilter_ops.info);
if (!bpfilter_ops.info.tgid) { if (!bpfilter_ops.info.tgid) {
err = bpfilter_ops.start(); err = bpfilter_ops.start();