SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmap-cache: introduce window_matches_by_addr()

Browse Source 
It is similar to window_matches(), but checks the mapped address.
Mostly preparation for later commits.
This commit is contained in:
Yu Watanabe
2023-11-04 11:42:19 +09:00
parent 1a25ab663c
commit 7a56f6b2b9
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-journal/mmap-cache.c
+12 -4
View File
@@ -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;