mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
fix xenctl_cpumap_to_cpumask() buffer size check
xenctl_cpumap_to_cpumask incorrectly uses sizeof when checking whether bits should be masked off from the input cpumap bitmap or not. Fix by using the correct cpumask buffer size in place of sizeof. Signed-off-by: Matthew Daley <mattjd@gmail.com> Compare against copy_bytes instead, and use equality rather than less- or-equal. Further, this issue (introduced with c/s 23991:a7ccbc79fc17) is not security relevant (i.e. the bug could not cause memory corruption): _xmalloc() never returns chunks of data smaller than the size of a pointer, i.e. even if sizeof(void*) > guest_bytes > copy_bytes, the piece of memory erroneously written to would still be inside the allocation done at the top of the function. Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: Keir Fraser <keir@xen.org> Committed-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
1 parent
0c6601ee18
commit
3c6881d8d0
1 file changed
+1
-1
+1
-1
@@ -78,7 +78,7 @@ int xenctl_cpumap_to_cpumask(
|
||||
{
|
||||
if ( copy_from_guest(bytemap, xenctl_cpumap->bitmap, copy_bytes) )
|
||||
err = -EFAULT;
|
||||
if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes <= sizeof(bytemap)) )
|
||||
if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes == copy_bytes) )
|
||||
bytemap[guest_bytes-1] &= ~(0xff << (xenctl_cpumap->nr_cpus & 7));
|
||||
}
|
||||
|
||||
|
||||