From 9ac13813d59479ac6c568ae3d838d034ea0ccdc8 Mon Sep 17 00:00:00 2001 From: Paul Durrant Date: Tue, 27 Nov 2018 16:39:17 +0000 Subject: [PATCH] tools/libs: xenforeignmemory_unmap_resource() should be idempotent... ...and is not because linux osdep_xenforeignmemory_unmap_resource() is not. Reported-by: Andrew Cooper Signed-off-by: Paul Durrant Acked-by: Wei Liu --- tools/libs/foreignmemory/linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libs/foreignmemory/linux.c b/tools/libs/foreignmemory/linux.c index 132875df8a..8daa5828e3 100644 --- a/tools/libs/foreignmemory/linux.c +++ b/tools/libs/foreignmemory/linux.c @@ -298,7 +298,7 @@ int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem, int osdep_xenforeignmemory_unmap_resource( xenforeignmemory_handle *fmem, xenforeignmemory_resource_handle *fres) { - return munmap(fres->addr, fres->nr_frames << PAGE_SHIFT); + return fres ? munmap(fres->addr, fres->nr_frames << PAGE_SHIFT) : 0; } int osdep_xenforeignmemory_map_resource( -- 2.30.2