From nobody Sun Jul 12 00:33:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1783632526; cv=none; d=zohomail.com; s=zohoarc; b=Dd/KTP555j7FWneTgJKkHMjygTa/jqO1lGNmUkBmxZldoar+zh/gqAzgH2SuRlVRlgE/8TQqICat+y0LXmMwRYBw+5VGHr88DEvzHYMbEXPSgJughe9Mt9RkRK/eIm0kC3T/80QsxWWD7+ydNirxO0E4+g7d3boseaDLuCW/flU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1783632526; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=cdhDkgTHfKqxBOiswfDOl+RwIrVKFia7sjo3NwIrfTU=; b=XfkwhAmq9cA3cWuKwgAkCy1tQylYF2hKvYNJlVYSOeQfHTs7oHRvjPaYiq9odgzOZ0Xr9X9Qky9DlboX2e51r6EJNuDWKAJIo4eQA4pyP+g9gU8TbB3E2v/KmiDbDxeVnBxIF78Tg44wD27Sc1jO9P2Jati7e19nXLvNiJ9viaY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1783632526070471.20742809028377; Thu, 9 Jul 2026 14:28:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1whwHy-0000u0-ES; Thu, 09 Jul 2026 17:28:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1whwHx-0000nD-CE for qemu-devel@nongnu.org; Thu, 09 Jul 2026 17:28:09 -0400 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1whwHv-0002u9-Ek for qemu-devel@nongnu.org; Thu, 09 Jul 2026 17:28:09 -0400 Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-698ab9aae16so489446a12.3 for ; Thu, 09 Jul 2026 14:28:07 -0700 (PDT) Received: from machine.. ([37.113.214.163]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-69a19dbee72sm10097802a12.30.2026.07.09.14.28.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2026 14:28:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783632486; x=1784237286; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=cdhDkgTHfKqxBOiswfDOl+RwIrVKFia7sjo3NwIrfTU=; b=jVHlAMqvc1rC2jp1hIfyJJzkbCOeJdZ3IOESOp5jmnc9PiKVek3m7alW6pUhvnklbF z/RXWkLq54iVqcMMrnNpszOvV8TjYDgBPwN1GGHHfNX6gH7fzlokQ5lM4jCDc0K0Qvm2 v/w7qzFb7GZR01/SrprdAARkP63NuF2umtpZnegtSjezNa3s1lXGe0Kz9BOZj7Nk28DL O28Kvi80Xqs3EYAtPkwKU0koBCDEy1ERUf5fLMPqRAlZJqSRU26nPmucM8jYzx3doS+/ f9xRRJ9YCTUZjj2T/5HggjlAre6J5kHMGUQPvEAemwIqd9HLdj8eDiyDJtzM4rELsQ59 LnPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783632486; x=1784237286; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=cdhDkgTHfKqxBOiswfDOl+RwIrVKFia7sjo3NwIrfTU=; b=h+hdupEVUbbPgcs/BXBVHWCxZ21Ch7yjovKyc2fCXvLhdpjgwpXk5z8+cHMkz4dRS8 hKYAWEvBI2eh7XBltPWWz+geRrX4u+IclbC2WeBCGcqzqmQ7yGDOs0WGiOVQcf0ME915 2MV6ZTLfZe8ZDXY0hRoY3GJ94LO2KgshWyh5jiBlXkBZxZ6ezSsgx4BxHnKBvlub/o5c QUpZFMUATuhA5MGugpH6Qodb4omMu5CmezcJ3KWZbc5e35DK3mLPaUsjpXAaoNMoGbMc 3hhhVUgKU5AiK6/Rf+QYerS/rCFSWKwVbt2YaqhhUF8Y0LBtIeThv7NElVpJz7dkoJ9s rfcQ== X-Gm-Message-State: AOJu0Yx/0//86TwE2ZJoD5bV4mFVnrEcKprMlkpivlt0u+BqOVNtyyBZ yZ0xpqWn+7Qrmop3wj5E9I07vhOZAuueNBkzyQZIlV9+9tBMLHGfXml6TZY1Fw== X-Gm-Gg: AfdE7ck1wlktPYjBBodhlj+t/5sBuW943C0J9b2J+2D7e/Xii2DOu5DB4eH9az6flKe +Dh9YkmFJOKJLO2MSD3obvmJTubv3j+iFxI257qjtAwdF8VsVGNVOsDtranS5g74Ny+3+E0kJQ1 XNqSwC4Wm12OGAtKZTJnoaaAuZKRcTKfF76s9BNkmusgRzaCDUG90mFBMZdoenyamAKhXKJNpCv tEVy2aQiJaensiKndVVXd5j6wPBl0SMcyWBEzYqkhu/3AdxNuHECx+XqtfGpG1gkoO4UCZ9AIcf JNrxIrnGRFDcK76Ke/4N4CxadbcQ3H98uHt4UXrHlRRZnsE13TJo5fXDxJZukzh7LKLxDxlvDNA duCHfPFJ6s1R2Ovg7WzXUPb9jsXJNqMhlbP9wAKsYvgDbEHGRf5GRwvoZ7iN1N3tZtZDz7VOhjO At5B/0V/YptTehxObU X-Received: by 2002:a05:6402:3552:b0:698:87ae:6ced with SMTP id 4fb4d7f45d1cf-69ab44b1288mr4316134a12.28.1783632485671; Thu, 09 Jul 2026 14:28:05 -0700 (PDT) From: Evgeny Kolmakov To: qemu-devel@nongnu.org Cc: berrange@redhat.com, Evgeny Kolmakov Subject: [PATCH] crypto: Use g_autofree Date: Fri, 10 Jul 2026 00:27:50 +0300 Message-ID: <20260709212750.290898-1-randomjack94dev@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=randomjack94dev@gmail.com; helo=mail-ed1-x530.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1783632527671158500 Content-Type: text/plain; charset="utf-8" Use g_autofree attribute to reduce the amount of manual g_free() calls and 'goto out' code Signed-off-by: Evgeny Kolmakov Reviewed-by: Daniel P. Berrang=C3=A9 --- crypto/block.c | 17 ++++++----------- crypto/hmac-gcrypt.c | 12 ++++-------- crypto/hmac-glib.c | 10 +++------- crypto/ivgen-essiv.c | 15 ++++----------- crypto/ivgen.c | 6 ++---- crypto/secret_keyring.c | 5 ++--- 6 files changed, 21 insertions(+), 44 deletions(-) diff --git a/crypto/block.c b/crypto/block.c index 96c83e60b9..42558f3caf 100644 --- a/crypto/block.c +++ b/crypto/block.c @@ -55,7 +55,7 @@ QCryptoBlock *qcrypto_block_open(QCryptoBlockOpenOptions = *options, unsigned int flags, Error **errp) { - QCryptoBlock *block =3D g_new0(QCryptoBlock, 1); + g_autofree QCryptoBlock *block =3D g_new0(QCryptoBlock, 1); =20 qemu_mutex_init(&block->mutex); =20 @@ -65,7 +65,6 @@ QCryptoBlock *qcrypto_block_open(QCryptoBlockOpenOptions = *options, !qcrypto_block_drivers[options->format]) { error_setg(errp, "Unsupported block driver %s", QCryptoBlockFormat_str(options->format)); - g_free(block); return NULL; } =20 @@ -74,11 +73,10 @@ QCryptoBlock *qcrypto_block_open(QCryptoBlockOpenOption= s *options, if (block->driver->open(block, options, optprefix, readfunc, opaque, flags, errp) < 0) { - g_free(block); return NULL; } =20 - return block; + return g_steal_pointer(&block); } =20 =20 @@ -90,7 +88,7 @@ QCryptoBlock *qcrypto_block_create(QCryptoBlockCreateOpti= ons *options, unsigned int flags, Error **errp) { - QCryptoBlock *block =3D g_new0(QCryptoBlock, 1); + g_autofree QCryptoBlock *block =3D g_new0(QCryptoBlock, 1); =20 qemu_mutex_init(&block->mutex); =20 @@ -100,7 +98,6 @@ QCryptoBlock *qcrypto_block_create(QCryptoBlockCreateOpt= ions *options, !qcrypto_block_drivers[options->format]) { error_setg(errp, "Unsupported block driver %s", QCryptoBlockFormat_str(options->format)); - g_free(block); return NULL; } =20 @@ -109,11 +106,10 @@ QCryptoBlock *qcrypto_block_create(QCryptoBlockCreate= Options *options, =20 if (block->driver->create(block, options, optprefix, initfunc, writefunc, opaque, errp) < 0) { - g_free(block); return NULL; } =20 - return block; + return g_steal_pointer(&block); } =20 =20 @@ -185,17 +181,16 @@ int qcrypto_block_amend_options(QCryptoBlock *block, QCryptoBlockInfo *qcrypto_block_get_info(QCryptoBlock *block, Error **errp) { - QCryptoBlockInfo *info =3D g_new0(QCryptoBlockInfo, 1); + g_autofree QCryptoBlockInfo *info =3D g_new0(QCryptoBlockInfo, 1); =20 info->format =3D block->format; =20 if (block->driver->get_info && block->driver->get_info(block, info, errp) < 0) { - g_free(info); return NULL; } =20 - return info; + return g_steal_pointer(&info); } =20 =20 diff --git a/crypto/hmac-gcrypt.c b/crypto/hmac-gcrypt.c index e428d17479..44631fb348 100644 --- a/crypto/hmac-gcrypt.c +++ b/crypto/hmac-gcrypt.c @@ -50,7 +50,7 @@ void *qcrypto_hmac_ctx_new(QCryptoHashAlgo alg, const uint8_t *key, size_t nkey, Error **errp) { - QCryptoHmacGcrypt *ctx; + g_autofree QCryptoHmacGcrypt *ctx =3D NULL; gcry_error_t err; =20 if (!qcrypto_hmac_supports(alg)) { @@ -66,7 +66,7 @@ void *qcrypto_hmac_ctx_new(QCryptoHashAlgo alg, if (err !=3D 0) { error_setg(errp, "Cannot initialize hmac: %s", gcry_strerror(err)); - goto error; + return NULL; } =20 err =3D gcry_mac_setkey(ctx->handle, (const void *)key, nkey); @@ -74,14 +74,10 @@ void *qcrypto_hmac_ctx_new(QCryptoHashAlgo alg, error_setg(errp, "Cannot set key: %s", gcry_strerror(err)); gcry_mac_close(ctx->handle); - goto error; + return NULL; } =20 - return ctx; - -error: - g_free(ctx); - return NULL; + return g_steal_pointer(&ctx); } =20 static void diff --git a/crypto/hmac-glib.c b/crypto/hmac-glib.c index b845133a05..1f17769c1c 100644 --- a/crypto/hmac-glib.c +++ b/crypto/hmac-glib.c @@ -46,7 +46,7 @@ void *qcrypto_hmac_ctx_new(QCryptoHashAlgo alg, const uint8_t *key, size_t nkey, Error **errp) { - QCryptoHmacGlib *ctx; + g_autofree QCryptoHmacGlib *ctx =3D NULL; =20 if (!qcrypto_hmac_supports(alg)) { error_setg(errp, "Unsupported hmac algorithm %s", @@ -60,14 +60,10 @@ void *qcrypto_hmac_ctx_new(QCryptoHashAlgo alg, (const uint8_t *)key, nkey); if (!ctx->ghmac) { error_setg(errp, "Cannot initialize hmac and set key"); - goto error; + return NULL; } =20 - return ctx; - -error: - g_free(ctx); - return NULL; + return g_steal_pointer(&ctx); } =20 static void diff --git a/crypto/ivgen-essiv.c b/crypto/ivgen-essiv.c index 3d5a188795..d5fa269888 100644 --- a/crypto/ivgen-essiv.c +++ b/crypto/ivgen-essiv.c @@ -31,10 +31,10 @@ static int qcrypto_ivgen_essiv_init(QCryptoIVGen *ivgen, const uint8_t *key, size_t nkey, Error **errp) { - uint8_t *salt; + g_autofree uint8_t *salt =3D NULL; size_t nhash; size_t nsalt; - QCryptoIVGenESSIV *essiv =3D g_new0(QCryptoIVGenESSIV, 1); + g_autofree QCryptoIVGenESSIV *essiv =3D g_new0(QCryptoIVGenESSIV, 1); =20 /* Not necessarily the same as nkey */ nsalt =3D qcrypto_cipher_get_key_len(ivgen->cipher); @@ -46,8 +46,6 @@ static int qcrypto_ivgen_essiv_init(QCryptoIVGen *ivgen, if (qcrypto_hash_bytes(ivgen->hash, (const gchar *)key, nkey, &salt, &nhash, errp) < 0) { - g_free(essiv); - g_free(salt); return -1; } =20 @@ -57,13 +55,10 @@ static int qcrypto_ivgen_essiv_init(QCryptoIVGen *ivgen, salt, MIN(nhash, nsalt), errp); if (!essiv->cipher) { - g_free(essiv); - g_free(salt); return -1; } =20 - g_free(salt); - ivgen->private =3D essiv; + ivgen->private =3D g_steal_pointer(&essiv); =20 return 0; } @@ -75,7 +70,7 @@ static int qcrypto_ivgen_essiv_calculate(QCryptoIVGen *iv= gen, { QCryptoIVGenESSIV *essiv =3D ivgen->private; size_t ndata =3D qcrypto_cipher_get_block_len(ivgen->cipher); - uint8_t *data =3D g_new(uint8_t, ndata); + g_autofree uint8_t *data =3D g_new(uint8_t, ndata); =20 sector =3D cpu_to_le64(sector); memcpy(data, (uint8_t *)§or, MIN(sizeof(sector), ndata)); @@ -88,7 +83,6 @@ static int qcrypto_ivgen_essiv_calculate(QCryptoIVGen *iv= gen, data, ndata, errp) < 0) { - g_free(data); return -1; } =20 @@ -99,7 +93,6 @@ static int qcrypto_ivgen_essiv_calculate(QCryptoIVGen *iv= gen, if (ndata < niv) { memset(iv + ndata, 0, niv - ndata); } - g_free(data); return 0; } =20 diff --git a/crypto/ivgen.c b/crypto/ivgen.c index 6b7d24d889..9f1f7d7dca 100644 --- a/crypto/ivgen.c +++ b/crypto/ivgen.c @@ -33,7 +33,7 @@ QCryptoIVGen *qcrypto_ivgen_new(QCryptoIVGenAlgo alg, const uint8_t *key, size_t nkey, Error **errp) { - QCryptoIVGen *ivgen =3D g_new0(QCryptoIVGen, 1); + g_autofree QCryptoIVGen *ivgen =3D g_new0(QCryptoIVGen, 1); =20 ivgen->algorithm =3D alg; ivgen->cipher =3D cipheralg; @@ -51,16 +51,14 @@ QCryptoIVGen *qcrypto_ivgen_new(QCryptoIVGenAlgo alg, break; default: error_setg(errp, "Unknown block IV generator algorithm %d", alg); - g_free(ivgen); return NULL; } =20 if (ivgen->driver->init(ivgen, key, nkey, errp) < 0) { - g_free(ivgen); return NULL; } =20 - return ivgen; + return g_steal_pointer(&ivgen); } =20 =20 diff --git a/crypto/secret_keyring.c b/crypto/secret_keyring.c index 78d7f09b3b..3b332276ef 100644 --- a/crypto/secret_keyring.c +++ b/crypto/secret_keyring.c @@ -41,7 +41,7 @@ qcrypto_secret_keyring_load_data(QCryptoSecretCommon *sec= _common, Error **errp) { QCryptoSecretKeyring *secret =3D QCRYPTO_SECRET_KEYRING(sec_common); - uint8_t *buffer =3D NULL; + g_autofree uint8_t *buffer =3D NULL; long retcode; =20 *output =3D NULL; @@ -61,12 +61,11 @@ qcrypto_secret_keyring_load_data(QCryptoSecretCommon *s= ec_common, =20 retcode =3D keyctl_read(secret->serial, buffer, retcode); if (retcode < 0) { - g_free(buffer); goto keyctl_error; } =20 *outputlen =3D retcode; - *output =3D buffer; + *output =3D g_steal_pointer(&buffer); return; =20 keyctl_error: --=20 2.43.0