d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xen/privcmd: fix MMAP_RESOURCE ioctl to copy out results

Browse Source 
The current definition for the MMAP_RESOURCE ioctl was wrong as it
didn't copy back the result to the caller. Fix the definition and also
remove the bogus attempt to copy the result in the implementation.

Note such copy back is only needed when querying the size of a
resource.

Sponsored by: Citrix Systems R&D
This commit is contained in:
Roger Pau Monné 2021-11-17 11:48:35 +01:00
parent 4fdc5b8494
commit 50d7d967bb
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/xen/privcmd/privcmd.c
View File

@ -426,12 +426,10 @@ privcmd_ioctl(struct cdev *dev, unsigned long cmd, caddr_t arg,
if (mmap->addr == 0 && mmap->num == 0) {
error = HYPERVISOR_memory_op(XENMEM_acquire_resource,
&adq);
if (error != 0) {
if (error != 0)
error = xen_translate_error(error);
break;
}
error = copyout(&adq.nr_frames, &mmap->num,
sizeof(mmap->num));
else
mmap->num = adq.nr_frames;
break;
}

2
sys/xen/privcmd.h
View File

@ -79,7 +79,7 @@ struct ioctl_privcmd_dmop {
#define IOCTL_PRIVCMD_MMAPBATCH \
_IOWR('E', 1, struct ioctl_privcmd_mmapbatch)
#define IOCTL_PRIVCMD_MMAP_RESOURCE \
_IOW('E', 2, struct ioctl_privcmd_mmapresource)
_IOWR('E', 2, struct ioctl_privcmd_mmapresource)
#define IOCTL_PRIVCMD_DM_OP \
_IOW('E', 3, struct ioctl_privcmd_dmop)
#define IOCTL_PRIVCMD_RESTRICT \