Merge pull request iovisor#123 from iovisor/bblanco_dev

Fix recursive loop in parsing pointer to self struct
linux-kern · Aug 11, 2015 · 3381c79 · 3381c79
2 parents 0d7245d + dfcdf0a
commit 3381c79
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/cc/frontends/clang/b_frontend_action.cc b/src/cc/frontends/clang/b_frontend_action.cc
@@ -64,7 +64,10 @@ bool BMapDeclVisitor::VisitRecordDecl(RecordDecl *D) {
  result_ += "\", [";
  for (auto F : D->getDefinition()->fields()) {
  result_ += "[";
- TraverseDecl(F);
+ if (F->getType()->isPointerType())
+ result_ += "\"unsigned long long\"";
+ else
+ TraverseDecl(F);
  if (F->isBitField())
  result_ += ", " + to_string(F->getBitWidthValue(C));
  result_ += "], ";

diff --git a/tests/cc/test_clang.py b/tests/cc/test_clang.py
@@ -65,5 +65,26 @@ def test_sscanf(self):
  self.assertEqual(l.s.a, 5)
  self.assertEqual(l.s.b, 6)
 
+ def test_iosnoop(self):
+ text = """
+#include <linux/blkdev.h>
+#include <uapi/linux/ptrace.h>
+
+struct key_t {
+ struct request *req;
+};
+
+BPF_TABLE("hash", struct key_t, u64, start, 1024);
+int do_request(struct pt_regs *ctx, struct request *req) {
+ struct key_t key = {};
+
+ bpf_trace_printk("traced start %d\\n", req->__data_len);
+
+ return 0;
+}
+"""
+ b = BPF(text=text, debug=0)
+ fn = b.load_func("do_request", BPF.KPROBE)
+
 if __name__ == "__main__":
  main()