aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTitus Rwantare <titusr@google.com>2023-03-22 17:55:12 +0000
committerPhilippe Mathieu-Daudé <philmd@linaro.org>2023-03-30 15:03:36 +0200
commit95bf34186577a3fc8d8b686bf6bc253a7f0d8c61 (patch)
tree00fcc42f33a8b1b38d3ac9362bdf1ed437c83888
parent9d403d27bc85928aa9b8eb53fcceb2d7745d51ac (diff)
downloadqemu-95bf34186577a3fc8d8b686bf6bc253a7f0d8c61.zip
qemu-95bf34186577a3fc8d8b686bf6bc253a7f0d8c61.tar.gz
qemu-95bf34186577a3fc8d8b686bf6bc253a7f0d8c61.tar.bz2
hw/i2c: pmbus: block uninitialised string reads
Devices models calling pmbus_send_string can't be relied upon to send a non-zero pointer. This logs an error and doesn't segfault. Reviewed-by: Patrick Venture <venture@google.com> Signed-off-by: Titus Rwantare <titusr@google.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-Id: <20230322175513.1550412-5-titusr@google.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-rw-r--r--hw/i2c/pmbus_device.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/i2c/pmbus_device.c b/hw/i2c/pmbus_device.c
index c3d6046..44fe4ed 100644
--- a/hw/i2c/pmbus_device.c
+++ b/hw/i2c/pmbus_device.c
@@ -94,6 +94,13 @@ void pmbus_send64(PMBusDevice *pmdev, uint64_t data)
void pmbus_send_string(PMBusDevice *pmdev, const char *data)
{
+ if (!data) {
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "%s: %s: uninitialised read from 0x%02x\n",
+ __func__, DEVICE(pmdev)->canonical_path, pmdev->code);
+ return;
+ }
+
size_t len = strlen(data);
g_assert(len > 0);
g_assert(len + pmdev->out_buf_len < SMBUS_DATA_MAX_LEN);