Bug-fix:
- Fix regression introduced byceb90fa0
(xen/privcmd: add PRIVCMD_MMAPBATCH_V2 ioctl). -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAABAgAGBQJQrDxZAAoJEFjIrFwIi8fJSkIIAKBo0SR5/JeCx2VtSomYh4Ea w0KuRdK2HI4bQa0JBE/3AsWQVdfshuQSSYIlLefLvyqCRDs6d/wRk83mu2vlFYKc 5kgq2t4et5jq3IWZJFysE1akOfEiyoDOmykC8fmJBF+IcLxcKPiKLHlmcSMcwwLG F0d2khm+J0e93b9DCgiDx/iima/ZPkJGowqXuYTIjmDPMnmBAIC1NDKafE6+Vxvf Tt5s59AvbgExKrgumYYuN+CjVTAKaVXLaSXJ5D6xFPfdGqKNSs+hD7li1GlWlk8V mM8+rAXQ8+arzxS2ywu0dQ3rgayCyUwcHUcpBX2ktvB6Axyb1mJkjd+Hql746S8= =u56k -----END PGP SIGNATURE----- Merge tag 'stable/for-linus-3.7-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen Pull Xen bug-fix from Konrad Rzeszutek Wilk: - Fix regression introduced by commitceb90fa0a8
("xen/privcmd: add PRIVCMD_MMAPBATCH_V2 ioctl"). * tag 'stable/for-linus-3.7-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/privcmd: Correctly return success from IOCTL_PRIVCMD_MMAPBATCH
This commit is contained in:
Коммит
74dcc3f904
|
@ -361,13 +361,13 @@ static long privcmd_ioctl_mmap_batch(void __user *udata, int version)
|
|||
down_write(&mm->mmap_sem);
|
||||
|
||||
vma = find_vma(mm, m.addr);
|
||||
ret = -EINVAL;
|
||||
if (!vma ||
|
||||
vma->vm_ops != &privcmd_vm_ops ||
|
||||
(m.addr != vma->vm_start) ||
|
||||
((m.addr + (nr_pages << PAGE_SHIFT)) != vma->vm_end) ||
|
||||
!privcmd_enforce_singleshot_mapping(vma)) {
|
||||
up_write(&mm->mmap_sem);
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
@ -383,12 +383,16 @@ static long privcmd_ioctl_mmap_batch(void __user *udata, int version)
|
|||
|
||||
up_write(&mm->mmap_sem);
|
||||
|
||||
if (state.global_error && (version == 1)) {
|
||||
/* Write back errors in second pass. */
|
||||
state.user_mfn = (xen_pfn_t *)m.arr;
|
||||
state.err = err_array;
|
||||
ret = traverse_pages(m.num, sizeof(xen_pfn_t),
|
||||
&pagelist, mmap_return_errors_v1, &state);
|
||||
if (version == 1) {
|
||||
if (state.global_error) {
|
||||
/* Write back errors in second pass. */
|
||||
state.user_mfn = (xen_pfn_t *)m.arr;
|
||||
state.err = err_array;
|
||||
ret = traverse_pages(m.num, sizeof(xen_pfn_t),
|
||||
&pagelist, mmap_return_errors_v1, &state);
|
||||
} else
|
||||
ret = 0;
|
||||
|
||||
} else if (version == 2) {
|
||||
ret = __copy_to_user(m.err, err_array, m.num * sizeof(int));
|
||||
if (ret)
|
||||
|
|
Загрузка…
Ссылка в новой задаче