summaryrefslogtreecommitdiffstats
path: root/patch-5.12.0-redhat.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-03-25 11:39:54 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-03-25 11:39:54 -0500
commit07405db22538d9e0d69ff13cdcf984aa2c1f6262 (patch)
treeb90287c0462f7582d67af797e6a2e1939e204b2d /patch-5.12.0-redhat.patch
parenta862662ed8c6219d4ff147cd99bd488ecf2f8cbf (diff)
downloadkernel-07405db22538d9e0d69ff13cdcf984aa2c1f6262.tar.gz
kernel-07405db22538d9e0d69ff13cdcf984aa2c1f6262.tar.xz
kernel-07405db22538d9e0d69ff13cdcf984aa2c1f6262.zip
kernel-5.12.0-0.rc4.20210325gite138138003eb.177
* Thu Mar 25 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc4.20210325gite138138003eb.177] - New configs in arch/powerpc (Fedora Kernel Team) - configs: enable BPF LSM on Fedora and ARK (Ondrej Mosnacek) - configs: clean up LSM configs (Ondrej Mosnacek) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-5.12.0-redhat.patch')
-rw-r--r--patch-5.12.0-redhat.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patch-5.12.0-redhat.patch b/patch-5.12.0-redhat.patch
index d865f886d..b97ce5c86 100644
--- a/patch-5.12.0-redhat.patch
+++ b/patch-5.12.0-redhat.patch
@@ -2112,7 +2112,7 @@ index 320f1f3941b7..e3632573c1ed 100644
obj-$(CONFIG_MODULES) += kmod.o
obj-$(CONFIG_MULTIUSER) += groups.o
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index c859bc46d06c..1c6e78fa2b6d 100644
+index 250503482cda..dde01992df7e 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -24,6 +24,7 @@
@@ -2150,7 +2150,7 @@ index c859bc46d06c..1c6e78fa2b6d 100644
static const struct bpf_map_ops * const bpf_map_types[] = {
#define BPF_PROG_TYPE(_id, _name, prog_ctx_type, kern_ctx_type)
-@@ -4346,11 +4365,17 @@ static int bpf_prog_bind_map(union bpf_attr *attr)
+@@ -4351,11 +4370,17 @@ static int bpf_prog_bind_map(union bpf_attr *attr)
SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, size)
{
union bpf_attr attr;