From patchwork Sat Oct 23 18:31:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1545228 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hc96Y30vQz9s0r for ; Sun, 24 Oct 2021 05:41:41 +1100 (AEDT) Received: from localhost ([::1]:33462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1meLxb-0001mV-4v for incoming@patchwork.ozlabs.org; Sat, 23 Oct 2021 14:41:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLo1-0005Ki-2F; Sat, 23 Oct 2021 14:31:45 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:56111) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLnx-0006dx-T8; Sat, 23 Oct 2021 14:31:44 -0400 Received: from quad ([82.142.24.54]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N0WsG-1mqUwG2Jhk-00wUou; Sat, 23 Oct 2021 20:31:28 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 06/11] hw/nvram: Fix Memory Leak in Xilinx eFuse QOM Date: Sat, 23 Oct 2021 20:31:18 +0200 Message-Id: <20211023183123.813116-7-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211023183123.813116-1-laurent@vivier.eu> References: <20211023183123.813116-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:cXqw9ESDNcHugyGqugIWENMhtlWj0lOJmmCxaatdevUCiZbQwAF 86uBVUyU5FBLNzy/0CuZxLpXyBytKBWRSaHSY4Mo7mGDXRJTxxROJ/7eKvRwFssfMYXnrux xU5GqbMF1wR1TUyclklUjFT7EmOE4ikGBG7uibZT4qkyKXsoUXv6qPDcCtmttakxh/btKmm NIHVM+9ySeokMIKJfsjrg== X-UI-Out-Filterresults: notjunk:1;V03:K0:J9XLkhMOaM8=:cOC5P4jVEtWApA0f9oxVV9 H8IOmS/zRU3vpSdmeZqZMNsl9OFFgYtrmJQGxOnP9SUAslPQrw8KYPPBx20DTY03/RGeTG6Lm c3tEyTgQknxcZCW29KPZeipnheFAV7h4MA+mdXPZb52pJ2WamuPFqGYDyEx8YL7umnFkAFFOr ZWptsDzr+BCVQpY9Lokfc7R2tvDw1xCotKtQsaCD/ak58LpmsgK/y7Bah1a89B3ubNal34l54 c6pnyLCLWxsZUVkSEK3uUCHvDprum5xbeeFFYXo2XCr4JRmg71SEbnZHO7Ifh0I4qdUCpzdfK KaU1WtD25k4vQl27LdEF7L8ZCE9nSwNxnMQrdJCwpQx7scm9Blzrjx5hPNoyyMq+ltMVFi4rv 69hFQOjXuZ9WNFG2auGudZeipat4tT6tNmGZGNq9ocKvxuWUSWGxY/rhWhh10IpFyv0b5pxcl YGcIxJlbBVPAjwtDr7p/XNa7bXx5EjPcvmaNQuGkPC+hJaLG00D71roGfUiV1S6pWpzNnvPaN RoPt5FIqcu6bHydVIK/g357qHS6/OmfMOKRSqJ13/3RnFm4NjZ+4MuR4bN4D8wvHiekTI7xTG DMTqCKaLKt9vAK7KXYETM4bJx39N5AR/fIQVWKaom9+zyOFwnjbrVUk/E44578Mhhouf/RzPu 9vqSJmqgGVWNmLNWpOWjtwZ1SyOgkh34sjc8RrsVMAR5Ju8S1ik+mkJI16snK+iBJbvE= Received-SPF: none client-ip=212.227.126.133; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , qemu-trivial@nongnu.org, Francisco Iglesias , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Tong Ho Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Tong Ho Signed-off-by: Tong Ho Reviewed-by: Edgar E. Iglesias Reviewed-by: Francisco Iglesias Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20211015203532.2463705-2-tong.ho@xilinx.com> Signed-off-by: Laurent Vivier --- hw/nvram/xlnx-efuse.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/nvram/xlnx-efuse.c b/hw/nvram/xlnx-efuse.c index ee1caab54cba..a0fd77b586dc 100644 --- a/hw/nvram/xlnx-efuse.c +++ b/hw/nvram/xlnx-efuse.c @@ -144,10 +144,11 @@ static bool efuse_ro_bits_find(XlnxEFuse *s, uint32_t k) bool xlnx_efuse_set_bit(XlnxEFuse *s, unsigned int bit) { if (efuse_ro_bits_find(s, bit)) { + g_autofree char *path = object_get_canonical_path(OBJECT(s)); + qemu_log_mask(LOG_GUEST_ERROR, "%s: WARN: " "Ignored setting of readonly efuse bit<%u,%u>!\n", - object_get_canonical_path(OBJECT(s)), - (bit / 32), (bit % 32)); + path, (bit / 32), (bit % 32)); return false; } @@ -202,9 +203,11 @@ static void efuse_realize(DeviceState *dev, Error **errp) efuse_ro_bits_sort(s); if ((s->efuse_size % 32) != 0) { + g_autofree char *path = object_get_canonical_path(OBJECT(s)); + error_setg(errp, "%s.efuse-size: %u: property value not multiple of 32.", - object_get_canonical_path(OBJECT(dev)), s->efuse_size); + path, s->efuse_size); return; }