bpf: Do not attempt to read blob_data if the length is 0

Signed-off-by: Daiki Ueno <[email protected]>
latchset · Nov 13, 2023 · f6c4eb3 · f6c4eb3
1 parent 31c21b9
commit f6c4eb3
Showing 1 changed file with 28 additions and 10 deletions.
diff --git a/agent/src/bpf/audit.bpf.c b/agent/src/bpf/audit.bpf.c
@@ -160,11 +160,18 @@ record_string_data (struct pt_regs *ctx, long context, const char *key_ptr,
 }
 
 static __always_inline int
-record_blob_data (struct pt_regs *ctx, long context, const char *key_ptr,
-		  void *value_ptr, size_t value_size)
+record_blob_data (struct pt_regs *ctx, long context, const char *key_ptr)
 {
   int err;
 
+  long value_size;
+  err = bpf_usdt_arg (ctx, 3, &value_size);
+  if (err < 0)
+    {
+      DEBUG ("unable to determine value size: %ld\n", err);
+      return err;
+    }
+
   struct audit_blob_data_event_st *event =
     bpf_ringbuf_reserve (&ringbuf,
 			 sizeof(struct audit_blob_data_event_st),
@@ -188,12 +195,24 @@ record_blob_data (struct pt_regs *ctx, long context, const char *key_ptr,
       goto error;
     }
 
-  value_size &= (VALUE_SIZE - 1);
-  err = bpf_probe_read_user (event->value, value_size, (void *)value_ptr);
-  if (err < 0)
+  if (value_size > 0)
     {
-      DEBUG ("unable to read event data: %ld\n", err);
-      goto error;
+      long value_ptr;
+
+      err = bpf_usdt_arg (ctx, 2, &value_ptr);
+      if (err < 0)
+	{
+	  DEBUG ("unable to read value: %ld\n", err);
+	  goto error;
+	}
+
+      value_size &= (VALUE_SIZE - 1);
+      err = bpf_probe_read_user (event->value, value_size, (void *)value_ptr);
+      if (err < 0)
+	{
+	  DEBUG ("unable to read event data: %ld\n", err);
+	  goto error;
+	}
     }
 
   event->size = value_size;
@@ -230,10 +249,9 @@ BPF_USDT(string_data, long context, const char *key_ptr,
 
 SEC("usdt")
 int
-BPF_USDT(blob_data, long context, const char *key_ptr,
-	 void *value_ptr, size_t value_size)
+BPF_USDT(blob_data, long context, const char *key_ptr)
 {
-  return record_blob_data(ctx, context, key_ptr, value_ptr, value_size);
+  return record_blob_data(ctx, context, key_ptr);
 }
 
 char LICENSE[] SEC("license") = "GPL";