qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org, qemu-arm@nongnu.org, qemu-block@nongnu.org,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Stefan Berger" <stefanb@linux.vnet.ibm.com>
Subject: [PATCH 12/12] backends/tpm: Use qemu_hexdump_line() to avoid sprintf()
Date: Wed, 10 Apr 2024 18:06:13 +0200	[thread overview]
Message-ID: <20240410160614.90627-13-philmd@linaro.org> (raw)
In-Reply-To: <20240410160614.90627-1-philmd@linaro.org>

sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1,
resulting in painful developper experience.

Use qemu_hexdump_line() to avoid sprintf() calls, silencing:

  backends/tpm/tpm_util.c:357:14: warning: 'sprintf' is deprecated:
    This function is provided for compatibility reasons only.
    Due to security concerns inherent in the design of sprintf(3),
    it is highly recommended that you use snprintf(3) instead.
    [-Wdeprecated-declarations]
        p += sprintf(p, "%.2X ", buffer[i]);
             ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 backends/tpm/tpm_util.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c
index 1856589c3b..0747af2d1c 100644
--- a/backends/tpm/tpm_util.c
+++ b/backends/tpm/tpm_util.c
@@ -21,6 +21,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
+#include "qemu/cutils.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "tpm_int.h"
@@ -336,27 +337,18 @@ void tpm_sized_buffer_reset(TPMSizedBuffer *tsb)
 void tpm_util_show_buffer(const unsigned char *buffer,
                           size_t buffer_size, const char *string)
 {
-    size_t len, i;
-    char *line_buffer, *p;
+    size_t len;
+    char *line, *lineup;
 
     if (!trace_event_get_state_backends(TRACE_TPM_UTIL_SHOW_BUFFER)) {
         return;
     }
     len = MIN(tpm_cmd_get_size(buffer), buffer_size);
 
-    /*
-     * allocate enough room for 3 chars per buffer entry plus a
-     * newline after every 16 chars and a final null terminator.
-     */
-    line_buffer = g_malloc(len * 3 + (len / 16) + 1);
+    line = qemu_hexdump_line(buffer, 0, len, false);
+    lineup = g_ascii_strup(line, -1);
+    trace_tpm_util_show_buffer(string, len, lineup);
 
-    for (i = 0, p = line_buffer; i < len; i++) {
-        if (i && !(i % 16)) {
-            p += sprintf(p, "\n");
-        }
-        p += sprintf(p, "%.2X ", buffer[i]);
-    }
-    trace_tpm_util_show_buffer(string, len, line_buffer);
-
-    g_free(line_buffer);
+    g_free(line);
+    g_free(lineup);
 }
-- 
2.41.0



  parent reply	other threads:[~2024-04-10 16:10 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-10 16:06 [PATCH 00/12] misc: Remove sprintf() due to macOS deprecation Philippe Mathieu-Daudé
2024-04-10 16:06 ` [PATCH 01/12] ui/console-vc: Replace sprintf() by g_strdup_printf() Philippe Mathieu-Daudé
2024-04-11  6:58   ` Marc-André Lureau
2024-04-11  7:47   ` Gerd Hoffmann
2024-04-11  9:36     ` Philippe Mathieu-Daudé
2024-04-11 10:02       ` Gerd Hoffmann
2024-04-10 16:06 ` [PATCH 02/12] hw/vfio/pci: " Philippe Mathieu-Daudé
2024-04-12 15:25   ` Alex Williamson
2024-04-15 14:01     ` Cédric Le Goater
2024-04-10 16:06 ` [PATCH 03/12] hw/ppc/spapr: " Philippe Mathieu-Daudé
2024-04-10 16:06 ` [PATCH 04/12] hw/mips/malta: Replace sprintf() by g_string_append_printf() Philippe Mathieu-Daudé
2024-04-10 16:06 ` [PATCH 05/12] system/qtest: " Philippe Mathieu-Daudé
2024-04-11  6:30   ` Thomas Huth
2024-04-10 16:06 ` [PATCH 06/12] util/hexdump: Rename @offset argument in qemu_hexdump_line() Philippe Mathieu-Daudé
2024-04-10 16:06 ` [PATCH 07/12] util/hexdump: Have qemu_hexdump_line() return heap allocated buffer Philippe Mathieu-Daudé
2024-04-10 16:06 ` [PATCH 08/12] util/hexdump: Replace sprintf() by g_string_append_printf() Philippe Mathieu-Daudé
2024-04-10 16:06 ` [PATCH 09/12] hw/scsi/scsi-disk: Use qemu_hexdump_line() to avoid sprintf() Philippe Mathieu-Daudé
2024-04-10 16:06 ` [PATCH 10/12] hw/ide/atapi: " Philippe Mathieu-Daudé
2024-04-10 16:06 ` [PATCH 11/12] hw/dma/pl330: " Philippe Mathieu-Daudé
2024-04-10 16:06 ` Philippe Mathieu-Daudé [this message]
2024-04-10 19:51   ` [PATCH 12/12] backends/tpm: " Stefan Berger
2024-04-10 19:12 ` [PATCH 00/12] misc: Remove sprintf() due to macOS deprecation Richard Henderson
2024-04-10 22:27   ` BALATON Zoltan
2024-04-11  9:38     ` Philippe Mathieu-Daudé
2024-04-19 10:48       ` Daniel P. Berrangé

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=20240410160614.90627-13-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=stefanb@linux.vnet.ibm.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).