mirror of https://github.com/xemu-project/xemu.git
ppc/pnv: ADU fix possible buffer overrun with invalid size
The ADU LPC transfer-size field is 7 bits, but the supported sizes for
LPC access via ADU appear to be 1, 2, 4, 8. The data buffer could
overrun if firmware set an invalid size field, so add checks to reject
them with a message.
Cc: qemu-stable@nongnu.org
Reported-by: Cédric Le Goater <clg@redhat.com>
Resolves: Coverity CID 1558830
Fixes: 24bd283bcc
("ppc/pnv: Implement ADU access to LPC space")
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
This commit is contained in:
parent
fdd9cf281d
commit
ddd2a060a0
|
@ -116,6 +116,12 @@ static void pnv_adu_xscom_write(void *opaque, hwaddr addr, uint64_t val,
|
|||
uint32_t lpc_size = lpc_cmd_size(adu);
|
||||
uint64_t data = 0;
|
||||
|
||||
if (!is_power_of_2(lpc_size) || lpc_size > sizeof(data)) {
|
||||
qemu_log_mask(LOG_GUEST_ERROR, "ADU: Unsupported LPC access "
|
||||
"size:%" PRId32 "\n", lpc_size);
|
||||
break;
|
||||
}
|
||||
|
||||
pnv_lpc_opb_read(adu->lpc, lpc_addr, (void *)&data, lpc_size);
|
||||
|
||||
/*
|
||||
|
@ -135,6 +141,12 @@ static void pnv_adu_xscom_write(void *opaque, hwaddr addr, uint64_t val,
|
|||
uint32_t lpc_size = lpc_cmd_size(adu);
|
||||
uint64_t data;
|
||||
|
||||
if (!is_power_of_2(lpc_size) || lpc_size > sizeof(data)) {
|
||||
qemu_log_mask(LOG_GUEST_ERROR, "ADU: Unsupported LPC access "
|
||||
"size:%" PRId32 "\n", lpc_size);
|
||||
break;
|
||||
}
|
||||
|
||||
data = cpu_to_be64(val) >> ((lpc_addr & 7) * 8); /* See above */
|
||||
pnv_lpc_opb_write(adu->lpc, lpc_addr, (void *)&data, lpc_size);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue