From patchwork Mon Feb 10 20:41:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 863823 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e42:0:b0:385:e875:8a9e with SMTP id r2csp1791289wrt; Mon, 10 Feb 2025 12:43:27 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVjvqtSX2ckE0qxTpCPWZSmLyKOMw1yTh9mf+PSNDWMqiwpugBWv4x7k2GBMGCavo5vLqIF5A==@linaro.org X-Google-Smtp-Source: AGHT+IHY9YTAN3Gp2Y8EjEPRTbknwbMVtwAHyvEMaFLFr/Wfwv1IdsDa1eAh9Hy7PcVBdss76WHN X-Received: by 2002:a05:622a:1a06:b0:467:6c18:9857 with SMTP id d75a77b69052e-47167acb689mr212887151cf.37.1739220207305; Mon, 10 Feb 2025 12:43:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739220207; cv=none; d=google.com; s=arc-20240605; b=BhBBx7O+lEqi/R4e13xJtGCKaXjYDqcfetgT8+9utRnTXIEMVmskgUtpiclO8NcNf4 Rk1eymOYk4Eum8CCBcWs9+EDPPrgtVNP5PluiUVmPf13kgA5LUBqvQ4gF8CjlD/VYCLh vu4wWEnYfJotU8cfmlVVuY15IqCr+bWDWcmOwbiFmh6XqN00uPu1R/8R8dspnI+Z1d11 qdkW2fQ+02n//ZNmL3aerOIflvSMkKBMxsndieVomcYBO0cX8VxhRiTuNyovG+U+1Uc+ d5ILxH7IvCZnQn6nyOuk2PlTXQwo3A5jcUmykRvfj9madOldA6h73pavcOLNxs/BMNNH hOJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=UcGKYNB2iXQxYTIMbFa2ddZc406Eqn3eyhE9dse+xIY=; fh=3C7pb61LcJt1Nv6ppaBTo4d5J8OOjWfF/0E+hDhSy/A=; b=HQKVMYHmzWT1MVGFif/lSvK4zf2rmnZ+GuzqsLbNlz/mQ3HcWw/9lM6Q2HS00PqidI veiFe2+QMF3b2rIw97PSQ3KaMA70bPmMKLw5eOomVJ9wxnhNq9wWyQwf2gRCqgtowiDC /v9lKFaJX5CUaUauDFn/GcGrfok7HcLK7tXPogdA7KldQGXNO2VLuyRPal3zZXYb5WcD DftgaU5+XNVDfQ+bmFozlaMZZ15fPhFK3aC2H5orR8gkv8tFvUGQDOkZ+dW5JlAqLGw1 NVsKNzZ25CneboIxX4bYttOY+N8s0tOOG/9DqJdCTPDdI8d3yWTvAyVaTCnAej8n9prn T2aQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r2zfbUH4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4717b930e12si53065381cf.112.2025.02.10.12.43.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Feb 2025 12:43:27 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r2zfbUH4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1thabj-00064l-Sw; Mon, 10 Feb 2025 15:42:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thabg-000645-Gi for qemu-devel@nongnu.org; Mon, 10 Feb 2025 15:42:18 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1thabe-0003Vw-PZ for qemu-devel@nongnu.org; Mon, 10 Feb 2025 15:42:16 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-439350f1a0bso13617705e9.0 for ; Mon, 10 Feb 2025 12:42:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739220133; x=1739824933; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UcGKYNB2iXQxYTIMbFa2ddZc406Eqn3eyhE9dse+xIY=; b=r2zfbUH4R5irxTQ9v2ebS3s50CLUdmSgRHu64ZIyCo8ho9pgVfpRn1amlwSRkXPA5N 8wnYiZov0iAp7XX/QxkqF4uaNjyQly/B84j5XVxKmtqI1HjlzfA5HVdMUKqK2XENMCSx kGpAQ6X3iS3LBc9oramPdd8IDDEC0daWF8hOoD411wVbDqIHGGNoNggE+wtfDD+Ja0aB 1DWb02tjN3wsoyCHN1XTVvMCMjMhWGSSXYo6GSKNrcbqjyW+6UwnfoN53jFfI6caY2r8 0/pYpAI5rgUbp5xQg8diWstSeD1gz8xx9Wt9H5jFsXwoVLGBtXYTlGcXWWRpqBhl3pv6 8itQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739220133; x=1739824933; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UcGKYNB2iXQxYTIMbFa2ddZc406Eqn3eyhE9dse+xIY=; b=B5J/D0s5jGYduzFooTLob6+QwlhqabHXJSzifz/7qsvObZjMaPRZbTgLiGnCDWFgU0 /GjNd1rr6LfMwUtfJQD6EBn4TMy0mtzzWmL8xRkrdkAIO2nfNAND3G5KNi5agxsvsFzH QmUj9BseJvYdEGhwdaEqTN8NsRCaCoFdc2uvRZfVTnClCqVfdybMHsSvu6rx5hRghsiM 7ckeaxZOg1VixxSax0XokJXcBR1O1geJyu0BLT2ZV0tslYE/E0ayNstM6BJO9Cb0d+cD x6LikGP3WXr4Xom2dY9Fb4LdM134CaBRFrPRieFO8i8vvzrkb67JGHYpuGohHgZS/nVt NlOA== X-Gm-Message-State: AOJu0YynOMtQ1/3lFQbg67MMdfiqDGYTSE5pxuCg3iCNjIwQtowKg96R ug8N5/wJBkuQicJWxsaotz+pAlPb1fd82Yq8BOZKVvwBwFoYy4RRrQuFAbUECPTaQPCW2mpnhWE lw2I= X-Gm-Gg: ASbGncvt+q3ZMpASo4EG+EtO/iOyIBkWMs1GTxFZLiRBRX3sJtgktEVlWCiuHOzDDHk HhWrX1WOFeJJgzt1hdrFaDJ7fZyhZ1OrPMvk6aQ5BVJhd7Tp3h0jeO9ny/3q1DsdlJd/IRABItn VELI9TFsP/42/Xnf0Dqj6WsEs2F2QSYdK0gMW78D3QcqWx461EmN//cpWH94Ja2ur9Ae5TfQcmO 7csZRuzKcbpTKGGCg0PcM7KvMiXqORLrXU/O+so1PTN9iGfu0pbwo4KzE8u9TVtZbAqvtPEvnrh zBfy2TaK3F+rg94PNmTVqlmeC/TECO3HAr9REoZGdBaUCVlNJZVmUwIqQgg309PcdQ== X-Received: by 2002:a7b:c7d8:0:b0:437:c453:ff19 with SMTP id 5b1f17b1804b1-4394cf0825fmr6068855e9.14.1739220132560; Mon, 10 Feb 2025 12:42:12 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38dbdd1af07sm13299269f8f.15.2025.02.10.12.42.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 10 Feb 2025 12:42:12 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Berger , Richard Henderson Subject: [PULL 01/32] backends/tpm: Use qemu_hexdump_line() to avoid sprintf() Date: Mon, 10 Feb 2025 21:41:33 +0100 Message-ID: <20250210204204.54407-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250210204204.54407-1-philmd@linaro.org> References: <20250210204204.54407-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1. Using qemu_hexdump_line() both fixes the deprecation warning and simplifies the code base. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Stefan Berger [rth: Keep the linebreaks every 16 bytes] Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20240412073346.458116-12-richard.henderson@linaro.org> [PMD: Rebased] --- backends/tpm/tpm_util.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c index 32946251060..0a428eaf756 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,8 +337,8 @@ 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; + g_autoptr(GString) str = NULL; + size_t len, i, l; if (!trace_event_get_state_backends(TRACE_TPM_UTIL_SHOW_BUFFER_CONTENT)) { return; @@ -345,19 +346,14 @@ void tpm_util_show_buffer(const unsigned char *buffer, len = MIN(tpm_cmd_get_size(buffer), buffer_size); trace_tpm_util_show_buffer_header(string, len); - /* - * 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); - - for (i = 0, p = line_buffer; i < len; i++) { - if (i && !(i % 16)) { - p += sprintf(p, "\n"); + for (i = 0; i < len; i += l) { + if (str) { + g_string_append_c(str, '\n'); } - p += sprintf(p, "%.2X ", buffer[i]); + l = MIN(len, 16); + str = qemu_hexdump_line(str, buffer, l, 1, 0); } - trace_tpm_util_show_buffer_content(line_buffer); - g_free(line_buffer); + g_string_ascii_up(str); + trace_tpm_util_show_buffer_content(str->str); }