Commit 32f0e57f authored by Jan Beulich's avatar Jan Beulich Committed by Zheng Zengkai
Browse files

Xen/x86: also check kernel mapping in set_foreign_p2m_mapping() 



stable inclusion
from stable-5.10.18
commit 0c08037b56a77219a6ec67c2cb19abf38722a525
bugzilla: 50148

--------------------------------

commit b512e1b0 upstream.

We should not set up further state if either mapping failed; paying
attention to just the user mapping's status isn't enough.

Also use GNTST_okay instead of implying its value (zero).

This is part of XSA-361.

Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: default avatarChen Jun <chenjun102@huawei.com>
Acked-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parent 19d6aece

arch/x86/xen/p2m.c

+2 −1
Original line number Diff line number Diff line
@@ -712,7 +712,8 @@ int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops, 
		unsigned long mfn, pfn;



		/* Do not add to override if the map failed. */

		if (map_ops[i].status)

		if (map_ops[i].status != GNTST_okay ||

		    (kmap_ops && kmap_ops[i].status != GNTST_okay))

			continue;



		if (map_ops[i].flags & GNTMAP_contains_pte) {