rbbcc 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cafb82823139848b9c16a2182ef4ba3c86c391126700ee6cbb31ab0a427da85
-  data.tar.gz: 711be4b7c0bf09879445d02b7bf0379b9c51dc186f56129227c416a0515e00ff
+  metadata.gz: 6795c09c9054d789de4ce10626404bc7f6e5f7cdb12296e2344b270f2a7fa2a7
+  data.tar.gz: e898c4bc91fcc3b7dff968a2daf44d667faf68c5ee9eef29b1eba4f14dc2d123
 SHA512:
-  metadata.gz: 007c4273121411d6548b071fe48fda59c36af94a36c7de183a8fbacceba722c837115af8a2892ec79277957217b5152b58ec12ce4dd56c153293a2ac6fae9894
-  data.tar.gz: 94da55a1738a534d0bffc95ac2ebabcb431e5ea98785506a0006e1d249b83d602f8bbcaec47890124afbf42a9a11f394f986b9795b194db0acb101a8d536ca26
+  metadata.gz: d40bb0cc232b51f25cc6970580c00bcb52c13cf7423f5082f3bbb447b9ea5d5a59acb958a68df4b3a3639bf86ac8ee72a673313d009cdb18be9eec52dc3176a9
+  data.tar.gz: e9af3796aa61f7f76b0122e13b2ec6c0958c8d33edeb6c0d34a5813e0f38e7f1cbd46eb267290a3935b381d94815cb7b4479d5adfeee428c709124b7456e3fa4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbbcc (0.11.0)
+    rbbcc (0.11.1)
       fiddle
 
 GEM

data/lib/rbbcc/bcc.rb

@@ -242,6 +242,7 @@ module RbBCC
       @uprobe_fds = {}
       @tracepoint_fds = {}
       @raw_tracepoint_fds = {}
+      @lsm_fds = {}
 
       if src_file
         src_file = BCC._find_file(src_file)
@@ -433,6 +434,34 @@ module RbBCC
       @tracepoint_fds.delete(tp)
     end
 
+    def attach_lsm(fn_name: "")
+      if @lsm_fds.keys.include?(fn_name)
+        raise "LSM #{fn_name} has been attached"
+      end
+
+      fn = load_func(fn_name, BPF::LSM)
+      fd = Clib.bpf_attach_lsm(fn[:fd])
+      if fd < 0
+        raise SystemCallError.new("Failed to attach LSM #{fn_name}", Fiddle.last_error)
+      end
+      Util.debug "Attach: #{fn_name}"
+      @lsm_fds[fn_name] = fd
+      self
+    end
+
+    def detach_lsm(fn_name)
+      unless @lsm_fds.keys.include?(fn_name)
+        raise "LSM #{fn_name} is not attached"
+      end
+
+      begin
+        File.for_fd(@lsm_fds[fn_name]).close
+      rescue => e
+        warn "Closing fd failed: #{e.inspect}. Ignore and skip"
+      end
+      @lsm_fds.delete(fn_name)
+    end
+
     def detach_kprobe_event(ev_name)
       unless @kprobe_fds.keys.include?(ev_name)
         raise "Event #{ev_name} not registered"
@@ -471,6 +500,10 @@ module RbBCC
       @tracepoint_fds.size
     end
 
+    def num_open_lsms
+      @lsm_fds.size
+    end
+
     def tracefile
       @tracefile ||= File.open("#{TRACEFS}/trace_pipe", "rb")
     end
@@ -528,6 +561,10 @@ module RbBCC
         detach_raw_tracepoint(k)
       end
 
+      @lsm_fds.each do |k, v|
+        detach_lsm(k)
+      end
+
       if @module
         Clib.bpf_module_destroy(@module)
       end
@@ -644,8 +681,7 @@ module RbBCC
             fn_name: fn[:name]
           )
         elsif func_name.start_with?("lsm__")
-          # LSM_PROBE programs are attached by libbcc while loading.
-          load_func(func_name, BPF::LSM)
+          attach_lsm(fn_name: func_name)
         end
       end
     end

data/lib/rbbcc/clib.rb

@@ -114,6 +114,7 @@ module RbBCC
     extern 'int bpf_attach_tracepoint(int progfd, char *tp_category, char *tp_name)'
     extern 'int bpf_detach_tracepoint(char *tp_category, char *tp_name)'
     extern 'int bpf_attach_raw_tracepoint(int progfd, char *tp_name)'
+    extern 'int bpf_attach_lsm(int progfd)'
     extern 'int bpf_open_perf_event(unsigned int, unsigned long, int, int)'
     extern 'int bpf_close_perf_event_fd(int)'
     extern 'int bpf_get_first_key(int, void *, int)'

data/lib/rbbcc/version.rb

@@ -1,3 +1,3 @@
 module RbBCC
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbcc
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Uchio Kondo