From 6b543b234659d9511fbc6cacb2defc84013a6e16 Mon Sep 17 00:00:00 2001 From: Timo Aaltonen Date: Tue, 15 Dec 2020 15:45:17 +0200 Subject: [PATCH] UBUNTU: [Config] Enable CONFIG_BPF_LSM See commit ce7e6e67bb37087c4566778f6d7a2907258f390b in master Ignore: yes Signed-off-by: Timo Aaltonen --- debian.oem/config/annotations | 2 +- debian.oem/config/config.common.ubuntu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.oem/config/annotations b/debian.oem/config/annotations index 8f92947f0a09c..edae7d1feec41 100644 --- a/debian.oem/config/annotations +++ b/debian.oem/config/annotations @@ -10825,7 +10825,7 @@ CONFIG_SYSFS_DEPRECATED policy<{'amd64': 'n', 'arm64': ' CONFIG_RELAY policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_BOOT_CONFIG policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_LD_DEAD_CODE_DATA_ELIMINATION policy<{'ppc64el': 'n'}> -CONFIG_BPF_LSM policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}> +CONFIG_BPF_LSM policy<{'amd64': 'y', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_BPF_SYSCALL policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_BPF_JIT_ALWAYS_ON policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_USERFAULTFD policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> diff --git a/debian.oem/config/config.common.ubuntu b/debian.oem/config/config.common.ubuntu index 7fc1b3668b039..4eca710a5a860 100644 --- a/debian.oem/config/config.common.ubuntu +++ b/debian.oem/config/config.common.ubuntu @@ -779,7 +779,7 @@ CONFIG_BPF_JIT=y CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_BPF_JIT_DEFAULT_ON=y CONFIG_BPF_KPROBE_OVERRIDE=y -# CONFIG_BPF_LSM is not set +CONFIG_BPF_LSM=y # CONFIG_BPF_PRELOAD is not set CONFIG_BPF_STREAM_PARSER=y CONFIG_BPF_SYSCALL=y