mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
xen: fix buffer over-read in bitmap_to_xenctl_bitmap()
There's an off-by-one when calculating the last byte in the input array to
bitmap_to_xenctl_bitmap(), which leads to bitmaps with sizes multiple of 8
to over-read and incorrectly use a byte past the end of the array.
Fixes: 288c4641c8 ('xen: simplify bitmap_to_xenctl_bitmap for little endian')
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
This commit is contained in:
1 parent
7897492d80
commit
cba90ddee0
1 file changed
+4
-1
+4
-1
@@ -369,6 +369,9 @@ int bitmap_to_xenctl_bitmap(struct xenctl_bitmap *xenctl_bitmap,
|
||||
const uint8_t *bytemap;
|
||||
uint8_t last, *buf = NULL;
|
||||
|
||||
if ( !nbits )
|
||||
return 0;
|
||||
|
||||
if ( !IS_ENABLED(LITTLE_ENDIAN) )
|
||||
{
|
||||
buf = xmalloc_array(uint8_t, xen_bytes);
|
||||
@@ -396,7 +399,7 @@ int bitmap_to_xenctl_bitmap(struct xenctl_bitmap *xenctl_bitmap,
|
||||
* their loops to 8 bits. Ensure we clear those left over bits so as to
|
||||
* prevent surprises.
|
||||
*/
|
||||
last = bytemap[nbits / 8];
|
||||
last = bytemap[(nbits - 1) / 8];
|
||||
if ( nbits % 8 )
|
||||
last &= (1U << (nbits % 8)) - 1;
|
||||
|
||||
|
||||