From: Kris Van Hees <kris.van.hees@oracle.com>
Date: Mon, 12 Jun 2017 13:33:05 +0000 (-0400)
Subject: dtrace: add kprobe-unsafe addresses to FBT blacklist
X-Git-Tag: v4.1.12-105.0.20170705_2000~12^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=437c9afad10bac4e44295cd5510c85f734844fa0;p=users%2Fjedix%2Flinux-maple.git

dtrace: add kprobe-unsafe addresses to FBT blacklist

By means of the newly introduced API to add entries to the FBT
blacklist, we make sure to register addresses that are unsafe for
kprobes with the FBT blacklist because they are unsafe there also.

Orabug: 26190412
Signed-off-by: Tomas Jedlicka <tomas.jedlicka@oracle.com>
Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
Acked-by: Nick Alcock <nick.alcock@oracle.com>
Reviewed-by: Dhaval Giani <dhaval.giani@oracle.com>
---

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index c90e417bb9636..3864e014e36dd 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -49,6 +49,10 @@
 #include <linux/cpu.h>
 #include <linux/jump_label.h>
 
+#ifdef CONFIG_DTRACE
+#include <linux/dtrace_fbt.h>
+#endif
+
 #include <asm-generic/sections.h>
 #include <asm/cacheflush.h>
 #include <asm/errno.h>
@@ -2071,6 +2075,10 @@ static int __init populate_kprobe_blacklist(unsigned long *start,
 			continue;
 		}
 
+#ifdef CONFIG_DTRACE
+		dtrace_fbt_bl_add(entry, NULL);
+#endif
+
 		ent = kmalloc(sizeof(*ent), GFP_KERNEL);
 		if (!ent)
 			return -ENOMEM;