From fc9f49710d5425644aedfd547e6ebca5d10d28a7 Mon Sep 17 00:00:00 2001 From: Kailun Qin Date: Thu, 23 Nov 2023 15:19:46 +0800 Subject: [PATCH] fixup! [LibOS] Update mmapped regions when writing to encrypted files Signed-off-by: Kailun Qin --- libos/src/bookkeep/libos_vma.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libos/src/bookkeep/libos_vma.c b/libos/src/bookkeep/libos_vma.c index 0c97ea21a0..5858135e5f 100644 --- a/libos/src/bookkeep/libos_vma.c +++ b/libos/src/bookkeep/libos_vma.c @@ -1373,14 +1373,14 @@ static bool vma_filter_needs_msync(struct libos_vma* vma, void* arg) { static bool vma_filter_needs_reload(struct libos_vma* vma, void* arg) { struct libos_handle* hdl = arg; + assert(hdl && hdl->inode); /* guaranteed to have inode because invoked from `write` callback */ if (vma->flags & (VMA_UNMAPPED | VMA_INTERNAL | MAP_ANONYMOUS | MAP_PRIVATE)) return false; - assert(vma->file && vma->file->inode); - assert(hdl && hdl->inode); + assert(vma->file); /* check above filtered out non-file-backed mappings */ - if (vma->file->inode != hdl->inode) + if (!vma->file->inode || vma->file->inode != hdl->inode) return false; if (!vma->file->fs || !vma->file->fs->fs_ops || !vma->file->fs->fs_ops->read)