qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Titus Rwantare" <titusr@google.com>,
	"Laurent Vivier" <laurent@vivier.eu>,
	"Jiaxun Yang" <jiaxun.yang@flygoat.com>,
	qemu-block@nongnu.org, "Patrick Venture" <venture@google.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 5/6] hw/i2c: pmbus: block uninitialised string reads
Date: Thu, 30 Mar 2023 15:18:55 +0200	[thread overview]
Message-ID: <20230330131856.94210-6-philmd@linaro.org> (raw)
In-Reply-To: <20230330131856.94210-1-philmd@linaro.org>

From: Titus Rwantare <titusr@google.com>

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>
---
 hw/i2c/pmbus_device.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/hw/i2c/pmbus_device.c b/hw/i2c/pmbus_device.c
index c3d6046784..44fe4eddbb 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);
-- 
2.38.1



  parent reply	other threads:[~2023-03-30 13:20 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-30 13:18 [PULL 0/6] Misc fixes for 2023-03-30 Philippe Mathieu-Daudé
2023-03-30 13:18 ` [PULL 1/6] linux-user/sparc: Don't use 16-bit UIDs on SPARC V9 Philippe Mathieu-Daudé
2023-05-12 11:13   ` Laurent Vivier
2023-05-12 12:08     ` John Paul Adrian Glaubitz
2023-05-12 15:43       ` Laurent Vivier
2023-03-30 13:18 ` [PULL 2/6] linux-user/mips: Use P5600 as default CPU to run NaN2008 ELF binaries Philippe Mathieu-Daudé
2023-03-30 13:18 ` [PULL 3/6] hw/mips/gt64xxx_pci: Don't endian-swap GT_PCI0_CFGADDR Philippe Mathieu-Daudé
2023-03-30 13:18 ` [PULL 4/6] tests/avocado: Enable TuxRun/mips64 (big-endian) test Philippe Mathieu-Daudé
2023-03-30 13:18 ` Philippe Mathieu-Daudé [this message]
2023-03-30 13:18 ` [PULL 6/6] block/dmg: Ignore C99 prototype declaration mismatch from <lzfse.h> Philippe Mathieu-Daudé
2023-03-31 11:59 ` [PULL 0/6] Misc fixes for 2023-03-30 Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230330131856.94210-6-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=jiaxun.yang@flygoat.com \
    --cc=laurent@vivier.eu \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=titusr@google.com \
    --cc=venture@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).