summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2020-06-25 16:08:46 -0500
committerEric W. Biederman <ebiederm@xmission.com>2020-07-04 09:35:50 -0500
commit0fe3c63148ef5df1b3cb067e4b4d45d45d0c0fdc (patch)
tree6db7c23ffc99af76bf991cf20195945e2cd3c39c
parent25cf336de51b51a3e440e1893751f9532095eff0 (diff)
downloadlinux-0fe3c63148ef5df1b3cb067e4b4d45d45d0c0fdc.tar.gz
linux-0fe3c63148ef5df1b3cb067e4b4d45d45d0c0fdc.tar.bz2
linux-0fe3c63148ef5df1b3cb067e4b4d45d45d0c0fdc.zip
bpfilter: Move bpfilter_umh back into init data
To allow for restarts 61fbf5933d42 ("net: bpfilter: restart bpfilter_umh when error occurred") moved the blob holding the userspace binary out of the init sections. Now that loading the blob into a filesystem is separate from executing the blob the blob no longer needs to live .rodata to allow for restarting. So move the blob back to .init.rodata. v1: https://lkml.kernel.org/r/87sgeidlvq.fsf_-_@x220.int.ebiederm.org v2: https://lkml.kernel.org/r/87ftad4ozc.fsf_-_@x220.int.ebiederm.org Link: https://lkml.kernel.org/r/20200702164140.4468-11-ebiederm@xmission.com Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Alexei Starovoitov <ast@kernel.org> Tested-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
-rw-r--r--net/bpfilter/bpfilter_umh_blob.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bpfilter/bpfilter_umh_blob.S b/net/bpfilter/bpfilter_umh_blob.S
index 9ea6100dca87..40311d10d2f2 100644
--- a/net/bpfilter/bpfilter_umh_blob.S
+++ b/net/bpfilter/bpfilter_umh_blob.S
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
- .section .rodata, "a"
+ .section .init.rodata, "a"
.global bpfilter_umh_start
bpfilter_umh_start:
.incbin "net/bpfilter/bpfilter_umh"