bug fix && release v2.1.4

SeeFlowerX · Oct 23, 2023 · 038aa66 · 038aa66
1 parent 8e23e22
commit 038aa66
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -334,7 +334,7 @@ coral:/data/local/tmp # readelf -s /apex/com.android.runtime/lib64/bionic/libc.s
 
 # 交流
 
-有关eBPF on Android系列可以[加群交流](./images/Snipaste_2023-10-16_17-30-46.png)
+有关eBPF on Android系列可以[加群交流](./images/Snipaste_2023-10-23_20-32-14.png)
 
 个人碎碎念太多，有关stackplz文章就不同步到本项目了，请移步博客查看：
 

diff --git a/images/Snipaste_2023-10-16_17-30-46.png b/images/Snipaste_2023-10-16_17-30-46.png
diff --git a/images/Snipaste_2023-10-23_20-32-14.png b/images/Snipaste_2023-10-23_20-32-14.png
diff --git a/src/common/buffer.h b/src/common/buffer.h
@@ -46,8 +46,8 @@ static __always_inline int save_bytes_to_buf(event_data_t *event, void *ptr, u32
 {
     // Data saved to submit buf: [index][size][ ... bytes ... ]
 
-    if (size == 0)
-        return 0;
+    // if (size == 0)
+    //     return 0;
 
     if (event->buf_off > ARGS_BUF_SIZE - 1)
         return 0;
@@ -67,10 +67,16 @@ static __always_inline int save_bytes_to_buf(event_data_t *event, void *ptr, u32
         return 0;
 
     // Read bytes into buffer
-    if (bpf_probe_read(&(event->args[event->buf_off + 1 + sizeof(int)]),
-                       size & (MAX_BYTES_ARR_SIZE - 1),
-                       ptr) == 0) {
-        // We update buf_off only if all writes were successful
+    if (size > 0) {
+        if (bpf_probe_read(&(event->args[event->buf_off + 1 + sizeof(int)]),
+                        size & (MAX_BYTES_ARR_SIZE - 1),
+                        ptr) == 0) {
+            // We update buf_off only if all writes were successful
+            event->buf_off += size + 1 + sizeof(int);
+            event->context.argnum++;
+            return 1;
+        }
+    } else {
         event->buf_off += size + 1 + sizeof(int);
         event->context.argnum++;
         return 1;