diff mbox series

[SRU,Eoan,1/2] Revert "UBUNTU: SAUCE: (efi-lockdown) Lock down kprobes"

Message ID 20200324095903.5406-2-cascardo@canonical.com
State New
Headers show
Series Allow BPF tracing under lockdown | expand

Commit Message

Thadeu Lima de Souza Cascardo March 24, 2020, 9:59 a.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1868626

This reverts commit 98147fbaa80ad04b6d2d90d80d7bc116d5930a5b.

Upstream lockdown support locks down kprobes only above the integrity
level. As we are moving to an integrity level on secure boot on Focal,
and there is no kprobes lockdown on Bionic too, this makes Eoan behave
like those two releases.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
---
 kernel/kprobes.c | 3 ---
 1 file changed, 3 deletions(-)
diff mbox series

Patch

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 2cce4b714e3f..ebe8315a756a 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -1557,9 +1557,6 @@  int register_kprobe(struct kprobe *p)
 	struct module *probed_mod;
 	kprobe_opcode_t *addr;
 
-	if (kernel_is_locked_down("Use of kprobes"))
-		return -EPERM;
-
 	/* Adjust probe address from symbol */
 	addr = kprobe_addr(p);
 	if (IS_ERR(addr))