mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-23 12:14:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

acpi_table: Fix coverity defect in acpi_write_spcr

Browse Source 
Fix "Integer handling issues  (SIGN_EXTENSION)" in newly added code:
Cast serial_info.reg_offset to u64 to prevent an integer overflow when
shifted too many bits to the left. Currently this never happens as the
shift is supposed to be less than 4.

Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
This commit is contained in:
Patrick Rudolph 2024-10-30 14:11:46 +01:00 committed by Tom Rini
parent e61ea9f2e5
commit 99ce74a41b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/acpi/acpi_table.c
View File

@ -420,7 +420,7 @@ int acpi_write_dbg2_pci_uart(struct acpi_ctx *ctx, struct udevice *dev,
static int acpi_write_spcr(struct acpi_ctx *ctx, const struct acpi_writer *entry) static int acpi_write_spcr(struct acpi_ctx *ctx, const struct acpi_writer *entry)
{ {
struct serial_device_info serial_info = {0}; struct serial_device_info serial_info = {0};
ulong serial_address, serial_offset; u64 serial_address, serial_offset;
struct acpi_table_header *header; struct acpi_table_header *header;
struct acpi_spcr *spcr; struct acpi_spcr *spcr;
struct udevice *dev; struct udevice *dev;
@ -473,7 +473,7 @@ static int acpi_write_spcr(struct acpi_ctx *ctx, const struct acpi_writer *entry
} }
serial_width = serial_info.reg_width * 8; serial_width = serial_info.reg_width * 8;
serial_offset = serial_info.reg_offset << serial_info.reg_shift; serial_offset = ((u64)serial_info.reg_offset) << serial_info.reg_shift;
serial_address = serial_info.addr + serial_offset; serial_address = serial_info.addr + serial_offset;
/* Encode register access size */ /* Encode register access size */
@ -495,7 +495,7 @@ static int acpi_write_spcr(struct acpi_ctx *ctx, const struct acpi_writer *entry
break; break;
} }
debug("UART type %u @ %lx\n", spcr->interface_type, serial_address); debug("UART type %u @ %llx\n", spcr->interface_type, serial_address);
/* Fill GAS */ /* Fill GAS */
spcr->serial_port.space_id = space_id; spcr->serial_port.space_id = space_id;