Check a return value of dpath helper

Signed-off-by: Masanori Misono <m.misono760@gmail.com>
bpftrace · Oct 14, 2020 · 688cab9 · 688cab9
1 parent 71de09a
commit 688cab9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/ast/codegen_llvm.cpp b/src/ast/codegen_llvm.cpp
@@ -606,7 +606,7 @@ void CodegenLLVM::visit(Call &call)
     AllocaInst *buf = b_.CreateAllocaBPF(bpftrace_.strlen_, "path");
     b_.CREATE_MEMSET(buf, b_.getInt8(0), bpftrace_.strlen_, 1);
     call.vargs->front()->accept(*this);
-    b_.CreatePath(buf, expr_);
+    b_.CreatePath(ctx_, buf, expr_, call.loc);
     expr_ = buf;
     expr_deleter_ = [this, buf]() { b_.CreateLifetimeEnd(buf); };
   }

diff --git a/src/ast/irbuilderbpf.cpp b/src/ast/irbuilderbpf.cpp
@@ -1147,7 +1147,10 @@ void IRBuilderBPF::CreateHelperErrorCond(Value *ctx,
   SetInsertPoint(helper_merge_block);
 }
 
-void IRBuilderBPF::CreatePath(AllocaInst *buf, Value *path)
+void IRBuilderBPF::CreatePath(Value *ctx,
+                              AllocaInst *buf,
+                              Value *path,
+                              const location &loc)
 {
   // int bpf_d_path(struct path *path, char *buf, u32 sz)
   // Return: 0 or error
@@ -1158,7 +1161,10 @@ void IRBuilderBPF::CreatePath(AllocaInst *buf, Value *path)
                                                 getInt64(
                                                     libbpf::BPF_FUNC_d_path),
                                                 d_path_func_ptr_type);
-  createCall(d_path_func, { path, buf, getInt32(bpftrace_.strlen_) }, "d_path");
+  CallInst *call = createCall(d_path_func,
+                              { path, buf, getInt32(bpftrace_.strlen_) },
+                              "d_path");
+  CreateHelperErrorCond(ctx, call, libbpf::BPF_FUNC_d_path, loc);
 }
 
 } // namespace ast

diff --git a/src/ast/irbuilderbpf.h b/src/ast/irbuilderbpf.h
@@ -159,7 +159,10 @@ class IRBuilderBPF : public IRBuilder<>
   StructType *GetStructType(std::string name, const std::vector<llvm::Type *> & elements, bool packed = false);
   AllocaInst *CreateUSym(llvm::Value *val);
   Value      *CreatKFuncArg(Value *ctx, SizedType& type, std::string& name);
-  void        CreatePath(AllocaInst *buf, Value *path);
+  void CreatePath(Value *ctx,
+                  AllocaInst *buf,
+                  Value *path,
+                  const location &loc);
   int helper_error_id_ = 0;
 
 private: