forked from luck/tmp_suning_uos_patched
ccd5565fee
[ Upstream commit f60a85cad677c4f9bb4cadd764f1d106c38c7cf8 ]
The syzbot reported a memleak as follows:
BUG: memory leak
unreferenced object 0xffff888101b41d00 (size 120):
comm "kworker/u4:0", pid 8, jiffies 4294944270 (age 12.780s)
backtrace:
[<ffffffff8125dc56>] alloc_pid+0x66/0x560
[<ffffffff81226405>] copy_process+0x1465/0x25e0
[<ffffffff81227943>] kernel_clone+0xf3/0x670
[<ffffffff812281a1>] kernel_thread+0x61/0x80
[<ffffffff81253464>] call_usermodehelper_exec_work
[<ffffffff81253464>] call_usermodehelper_exec_work+0xc4/0x120
[<ffffffff812591c9>] process_one_work+0x2c9/0x600
[<ffffffff81259ab9>] worker_thread+0x59/0x5d0
[<ffffffff812611c8>] kthread+0x178/0x1b0
[<ffffffff8100227f>] ret_from_fork+0x1f/0x30
unreferenced object 0xffff888110ef5c00 (size 232):
comm "kworker/u4:0", pid 8414, jiffies 4294944270 (age 12.780s)
backtrace:
[<ffffffff8154a0cf>] kmem_cache_zalloc
[<ffffffff8154a0cf>] __alloc_file+0x1f/0xf0
[<ffffffff8154a809>] alloc_empty_file+0x69/0x120
[<ffffffff8154a8f3>] alloc_file+0x33/0x1b0
[<ffffffff8154ab22>] alloc_file_pseudo+0xb2/0x140
[<ffffffff81559218>] create_pipe_files+0x138/0x2e0
[<ffffffff8126c793>] umd_setup+0x33/0x220
[<ffffffff81253574>] call_usermodehelper_exec_async+0xb4/0x1b0
[<ffffffff8100227f>] ret_from_fork+0x1f/0x30
After the UMD process exits, the pipe_to_umh/pipe_from_umh and
tgid need to be released.
Fixes: d71fa5c976 ("bpf: Add kernel module with user mode driver that populates bpffs.")
Reported-by: syzbot+44908bb56d2bfe56b28e@syzkaller.appspotmail.com
Signed-off-by: Zqiang <qiang.zhang@windriver.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20210317030915.2865-1-qiang.zhang@windriver.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
103 lines
2.2 KiB
C
103 lines
2.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
#include <linux/pid.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/sched/signal.h>
|
|
#include "bpf_preload.h"
|
|
|
|
extern char bpf_preload_umd_start;
|
|
extern char bpf_preload_umd_end;
|
|
|
|
static int preload(struct bpf_preload_info *obj);
|
|
static int finish(void);
|
|
|
|
static struct bpf_preload_ops umd_ops = {
|
|
.info.driver_name = "bpf_preload",
|
|
.preload = preload,
|
|
.finish = finish,
|
|
.owner = THIS_MODULE,
|
|
};
|
|
|
|
static int preload(struct bpf_preload_info *obj)
|
|
{
|
|
int magic = BPF_PRELOAD_START;
|
|
loff_t pos = 0;
|
|
int i, err;
|
|
ssize_t n;
|
|
|
|
err = fork_usermode_driver(&umd_ops.info);
|
|
if (err)
|
|
return err;
|
|
|
|
/* send the start magic to let UMD proceed with loading BPF progs */
|
|
n = kernel_write(umd_ops.info.pipe_to_umh,
|
|
&magic, sizeof(magic), &pos);
|
|
if (n != sizeof(magic))
|
|
return -EPIPE;
|
|
|
|
/* receive bpf_link IDs and names from UMD */
|
|
pos = 0;
|
|
for (i = 0; i < BPF_PRELOAD_LINKS; i++) {
|
|
n = kernel_read(umd_ops.info.pipe_from_umh,
|
|
&obj[i], sizeof(*obj), &pos);
|
|
if (n != sizeof(*obj))
|
|
return -EPIPE;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int finish(void)
|
|
{
|
|
int magic = BPF_PRELOAD_END;
|
|
struct pid *tgid;
|
|
loff_t pos = 0;
|
|
ssize_t n;
|
|
|
|
/* send the last magic to UMD. It will do a normal exit. */
|
|
n = kernel_write(umd_ops.info.pipe_to_umh,
|
|
&magic, sizeof(magic), &pos);
|
|
if (n != sizeof(magic))
|
|
return -EPIPE;
|
|
|
|
tgid = umd_ops.info.tgid;
|
|
if (tgid) {
|
|
wait_event(tgid->wait_pidfd, thread_group_exited(tgid));
|
|
umd_cleanup_helper(&umd_ops.info);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int __init load_umd(void)
|
|
{
|
|
int err;
|
|
|
|
err = umd_load_blob(&umd_ops.info, &bpf_preload_umd_start,
|
|
&bpf_preload_umd_end - &bpf_preload_umd_start);
|
|
if (err)
|
|
return err;
|
|
bpf_preload_ops = &umd_ops;
|
|
return err;
|
|
}
|
|
|
|
static void __exit fini_umd(void)
|
|
{
|
|
struct pid *tgid;
|
|
|
|
bpf_preload_ops = NULL;
|
|
|
|
/* kill UMD in case it's still there due to earlier error */
|
|
tgid = umd_ops.info.tgid;
|
|
if (tgid) {
|
|
kill_pid(tgid, SIGKILL, 1);
|
|
|
|
wait_event(tgid->wait_pidfd, thread_group_exited(tgid));
|
|
umd_cleanup_helper(&umd_ops.info);
|
|
}
|
|
umd_unload_blob(&umd_ops.info);
|
|
}
|
|
late_initcall(load_umd);
|
|
module_exit(fini_umd);
|
|
MODULE_LICENSE("GPL");
|