xnu-7195.101.1.tar.gz

[apple/xnu.git] / san / ubsan_log.c

diff --git a/san/ubsan_log.c b/san/ubsan_log.c
index 0c77d4ce9be72f4e693fc03196f16d429a8482f8..aedd9f94e81afbc305ed51fffe990afe2c6e710a 100644 (file)
--- a/san/ubsan_log.c
+++ b/san/ubsan_log.c
@@ -111,24 +111,26 @@ sysctl_ubsan_log_dump SYSCTL_HANDLER_ARGS
        os_atomic_thread_fence(seq_cst);
        tail = os_atomic_load(&ubsan_log_tail, relaxed);
 
-       char *buf;
-       size_t n = 0;
-       int err;
-
        if (tail == head) {
                return 0; /* log is empty */
        }
 
-       buf = kheap_alloc(KHEAP_TEMP, sz, Z_WAITOK | Z_ZERO);
+       char *buf = kheap_alloc(KHEAP_TEMP, sz, Z_WAITOK | Z_ZERO);
        if (!buf) {
                return 0;
        }
 
+       struct ubsan_buf ubsan_buf = {
+               .ub_logged = 0,
+               .ub_buf_size = sz,
+               .ub_buf = buf
+       };
+
        for (size_t i = tail; i != head; i = next_entry(i)) {
-               n += ubsan_format(&ubsan_log[i], buf + n, sz - n);
+               ubsan_format(&ubsan_log[i], &ubsan_buf);
        }
 
-       err = SYSCTL_OUT(req, buf, n);
+       int err = SYSCTL_OUT(req, buf, ubsan_buf.ub_logged);
 
        kheap_free(KHEAP_TEMP, buf, sz);
        return err;