tools/xen-mfndump: Avoid munmap(NULL, PAGE_SIZE) on certain error paths

Coverity ID 1090361 1090362 1090363

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
Acked-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
This commit is contained in:
Andrew Cooper authored and Ian Jackson committed 2013-11-25 12:15:55 +00:00
1 parent c635c1ef78
commit 4fa0ddeef7
1 file changed
+6 -3
+6 -3
View File
@@ -240,7 +240,8 @@ int dump_ptes_func(int argc, char *argv[])
domid, pfn, minfo.p2m_table[pfn]);
out:
munmap(page, PAGE_SIZE);
if ( page )
munmap(page, PAGE_SIZE);
xc_unmap_domain_meminfo(xch, &minfo);
munmap(m2p_table, M2P_SIZE(max_mfn));
return rc;
@@ -359,8 +360,10 @@ int memcmp_mfns_func(int argc, char *argv[])
printf(" memcpy(1, 2) = %d\n", memcmp(page1, page2, PAGE_SIZE));
out:
munmap(page1, PAGE_SIZE);
munmap(page2, PAGE_SIZE);
if ( page1 )
munmap(page1, PAGE_SIZE);
if ( page2 )
munmap(page2, PAGE_SIZE);
return rc;
}
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.