From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 30 Sep 2023 02:46:42 +0000 (+0900)
Subject: mmap-cache: introduce window_matches_by_addr()
X-Git-Tag: v255-rc1~11^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a56f6b2b9ac423ecdf91733bbdd91a13d56ea34;p=thirdparty%2Fsystemd.git

mmap-cache: introduce window_matches_by_addr()

It is similar to window_matches(), but checks the mapped address.
Mostly preparation for later commits.
---

diff --git a/src/libsystemd/sd-journal/mmap-cache.c b/src/libsystemd/sd-journal/mmap-cache.c
index 9e69e31ba3c..3f22d83b282 100644
--- a/src/libsystemd/sd-journal/mmap-cache.c
+++ b/src/libsystemd/sd-journal/mmap-cache.c
@@ -146,6 +146,16 @@ static bool window_matches(Window *w, MMapFileDescriptor *f, uint64_t offset, si
                 offset + size <= w->offset + w->size;
 }
 
+static bool window_matches_by_addr(Window *w, MMapFileDescriptor *f, void *addr, size_t size) {
+        assert(size > 0);
+
+        return
+                w &&
+                f == w->fd &&
+                (uint8_t*) addr >= (uint8_t*) w->ptr &&
+                (uint8_t*) addr + size <= (uint8_t*) w->ptr + w->size;
+}
+
 static Window* window_add(MMapFileDescriptor *f, uint64_t offset, size_t size, void *ptr) {
         MMapCache *m = mmap_cache_fd_cache(f);
         Window *w;
@@ -403,13 +413,11 @@ static void mmap_cache_process_sigbus(MMapCache *m) {
 
                 ours = false;
                 HASHMAP_FOREACH(f, m->fds) {
-                        LIST_FOREACH(windows, w, f->windows) {
-                                if ((uint8_t*) addr >= (uint8_t*) w->ptr &&
-                                    (uint8_t*) addr < (uint8_t*) w->ptr + w->size) {
+                        LIST_FOREACH(windows, w, f->windows)
+                                if (window_matches_by_addr(w, f, addr, 1)) {
                                         found = ours = f->sigbus = true;
                                         break;
                                 }
-                        }
 
                         if (ours)
                                 break;