diff options
| author | Jan Beulich <jbeulich@suse.com> | 2021-02-15 08:50:08 +0100 |
|---|---|---|
| committer | Juergen Gross <jgross@suse.com> | 2021-02-15 08:50:08 +0100 |
| commit | b512e1b077e5ccdbd6e225b15d934ab12453b70a (patch) | |
| tree | 3400354ce158db8092efaffa987542d9d72403a4 /arch/x86/xen | |
| parent | a35f2ef3b7376bfd0a57f7844bd7454389aae1fc (diff) | |
Xen/x86: also check kernel mapping in set_foreign_p2m_mapping()
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: Jan Beulich <jbeulich@suse.com>
Cc: stable@vger.kernel.org
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/p2m.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c index ac579c44dd28..b5949e5a83ec 100644 --- a/arch/x86/xen/p2m.c +++ b/arch/x86/xen/p2m.c @@ -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) { |