diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-06-26 20:13:48 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-28 21:39:16 +0900 |
| commit | 8e75887d321d102200abf3a9fa621e2c10ff4cc5 (patch) | |
| tree | 6c43fe825ee8cee037dbbfae0a80d9d5f49d0b78 /net/bpfilter/bpfilter_kern.c | |
| parent | 977c7114ebda2e746a114840d3a875e0cdb826fb (diff) | |
bpfilter: include bpfilter_umh in assembly instead of using objcopy
What we want here is to embed a user-space program into the kernel.
Instead of the complex ELF magic, let's simply wrap it in the assembly
with the '.incbin' directive.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bpfilter/bpfilter_kern.c')
| -rw-r--r-- | net/bpfilter/bpfilter_kern.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/net/bpfilter/bpfilter_kern.c b/net/bpfilter/bpfilter_kern.c index 09522573f611..f0fc182d3db7 100644 --- a/net/bpfilter/bpfilter_kern.c +++ b/net/bpfilter/bpfilter_kern.c @@ -10,11 +10,8 @@ #include <linux/file.h> #include "msgfmt.h" -#define UMH_start _binary_net_bpfilter_bpfilter_umh_start -#define UMH_end _binary_net_bpfilter_bpfilter_umh_end - -extern char UMH_start; -extern char UMH_end; +extern char bpfilter_umh_start; +extern char bpfilter_umh_end; static struct umh_info info; /* since ip_getsockopt() can run in parallel, serialize access to umh */ @@ -93,7 +90,9 @@ static int __init load_umh(void) int err; /* fork usermode process */ - err = fork_usermode_blob(&UMH_start, &UMH_end - &UMH_start, &info); + err = fork_usermode_blob(&bpfilter_umh_start, + &bpfilter_umh_end - &bpfilter_umh_start, + &info); if (err) return err; pr_info("Loaded bpfilter_umh pid %d\n", info.pid); |