Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56eeac7d authored by Jan Beulich's avatar Jan Beulich Committed by Greg Kroah-Hartman
Browse files

xen/privcmd: fix error handling in mmap-resource processing 



commit e11423d6721dd63b23fb41ade5e8d0b448b17780 upstream.

xen_pfn_t is the same size as int only on 32-bit builds (and not even
on Arm32). Hence pfns[] can't be used directly to read individual error
values returned from xen_remap_domain_mfn_array(); every other error
indicator would be skipped/ignored on 64-bit.

Fixes: 3ad08765 ("xen/privcmd: add IOCTL_PRIVCMD_MMAP_RESOURCE")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

Link: https://lore.kernel.org/r/aa6d6a67-6889-338a-a910-51e889f792d5@suse.com


Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent 2cc9bc23

drivers/xen/privcmd.c

+4 −3
Original line number Diff line number Diff line
@@ -835,11 +835,12 @@ static long privcmd_ioctl_mmap_resource(struct file *file, 
		unsigned int domid =

			(xdata.flags & XENMEM_rsrc_acq_caller_owned) ?

			DOMID_SELF : kdata.dom;

		int num;

		int num, *errs = (int *)pfns;



		BUILD_BUG_ON(sizeof(*errs) > sizeof(*pfns));

		num = xen_remap_domain_mfn_array(vma,

						 kdata.addr & PAGE_MASK,

						 pfns, kdata.num, (int *)pfns,

						 pfns, kdata.num, errs,

						 vma->vm_page_prot,

						 domid,

						 vma->vm_private_data);
@@ -849,7 +850,7 @@ static long privcmd_ioctl_mmap_resource(struct file *file, 
			unsigned int i;



			for (i = 0; i < num; i++) {

				rc = pfns[i];

				rc = errs[i];

				if (rc < 0)

					break;

			}