[PATCH 1/1] dm: avoid NULL dereference in add_item()

acpi_add_other_item() passes dev = NULL. Instead of dev->name write the string "other" to the debug log:
ACPI: Writing ACPI tables at 1fd3000 0base: writing table '<NULL>' * other: Added type 3, 0000000011fd4000, size 240 1facs: writing table 'FACS' * other: Added type 3, 0000000011fd4240, size 40 5csrt: writing table 'CSRT' * other: Added type 3, 0000000011fd4280, size 30
Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com --- drivers/core/acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/core/acpi.c b/drivers/core/acpi.c index 0df58dbc0d..8457733edb 100644 --- a/drivers/core/acpi.c +++ b/drivers/core/acpi.c @@ -159,8 +159,8 @@ static int add_item(struct acpi_ctx *ctx, struct udevice *dev, memcpy(item->buf, start, item->size); } item_count++; - log_debug("* %s: Added type %d, %p, size %x\n", dev->name, type, start, - item->size); + log_debug("* %s: Added type %d, %p, size %x\n", + dev ? dev->name : "other", type, start, item->size);
return 0; }

On Sun, 10 Jul 2022 at 07:40, Heinrich Schuchardt heinrich.schuchardt@canonical.com wrote:
acpi_add_other_item() passes dev = NULL. Instead of dev->name write the string "other" to the debug log:
ACPI: Writing ACPI tables at 1fd3000 0base: writing table '<NULL>' * other: Added type 3, 0000000011fd4000, size 240 1facs: writing table 'FACS' * other: Added type 3, 0000000011fd4240, size 40 5csrt: writing table 'CSRT' * other: Added type 3, 0000000011fd4280, size 30
Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com
drivers/core/acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
I'm not sure what the purpose of this is and the commit message does not state it. But it seems reasonable:
Reviewed-by: Simon Glass sjg@chromium.org

On Sun, 10 Jul 2022 at 07:40, Heinrich Schuchardt heinrich.schuchardt@canonical.com wrote:
acpi_add_other_item() passes dev = NULL. Instead of dev->name write the string "other" to the debug log:
ACPI: Writing ACPI tables at 1fd3000 0base: writing table '<NULL>' * other: Added type 3, 0000000011fd4000, size 240 1facs: writing table 'FACS' * other: Added type 3, 0000000011fd4240, size 40 5csrt: writing table 'CSRT' * other: Added type 3, 0000000011fd4280, size 30
Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com
drivers/core/acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
I'm not sure what the purpose of this is and the commit message does not state it. But it seems reasonable:
Reviewed-by: Simon Glass sjg@chromium.org
Applied to u-boot-dm, thanks!
participants (2)
-
Heinrich Schuchardt
-
Simon Glass