From: Mark Wielaard <mjw@redhat.com>
Date: Mon, 5 Sep 2011 21:37:11 +0000 (+0200)
Subject: PR13112 (and PR13108) blacklist probing function from include/asm .h files.
X-Git-Tag: release-1.7~153^2~63
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=44a7e76ab8cd9b9942b8d8a72d065269cd637c4a;p=systemtap.git

PR13112 (and PR13108) blacklist probing function from include/asm .h files.

dwflpp.cxx (build_blacklist): all include/asm .h blfile patterns might
need "full path" so prefix those with '.*'
Add new XFAIL semok.exp inb_blacklisted.stp testcase.
---

diff --git a/dwflpp.cxx b/dwflpp.cxx
index a4a1a9560..3f6d98719 100644
--- a/dwflpp.cxx
+++ b/dwflpp.cxx
@@ -2954,14 +2954,16 @@ dwflpp::build_blacklist()
   blsection += "|\\.meminit\\.";
   blsection += "|\\.memexit\\.";
 
+  /* NOTE all include/asm .h blfile patterns might need "full path"
+     so prefix those with '.*' - see PR13108 and PR13112. */
   blfile += "kernel/kprobes\\.c"; // first alternative, no "|"
   blfile += "|arch/.*/kernel/kprobes\\.c";
   // Older kernels need ...
-  blfile += "|include/asm/io\\.h";
-  blfile += "|include/asm/bitops\\.h";
+  blfile += "|.*/include/asm/io\\.h";
+  blfile += "|.*/include/asm/bitops\\.h";
   // While newer ones need ...
-  blfile += "|arch/.*/include/asm/io\\.h";
-  blfile += "|arch/.*/include/asm/bitops\\.h";
+  blfile += "|.*/arch/.*/include/asm/io\\.h";
+  blfile += "|.*/arch/.*/include/asm/bitops\\.h";
   blfile += "|drivers/ide/ide-iops\\.c";
 
   // XXX: it would be nice if these blacklisted functions were pulled
diff --git a/testsuite/semko/inb_blacklisted.stp b/testsuite/semko/inb_blacklisted.stp
new file mode 100755
index 000000000..46baab864
--- /dev/null
+++ b/testsuite/semko/inb_blacklisted.stp
@@ -0,0 +1,8 @@
+#! stap -p2
+
+/* PR13112 (and PR13108)
+   probing functions from blacklisted files shouldn't be possible. */
+probe kernel.function("inb@*.h")
+{
+  log("blacklisted")
+}