From nobody Sun Feb 8 14:52:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1570813392; cv=none; d=zoho.com; s=zohoarc; b=fcCFKGRKFYbG13Gahq7ah/04tQQcU4DtaMW5X5uqg9GARUm6wNsRw0jwvlHpvHeYh2hQNhrZTAic6rgFFDeB2JsULoepUESFTHlbAQu+3K6E9+7dCeTjgtd6em3m/ZjWw6sEnkfhp+G7kVsaQdm+hSFkI2k/aCvrym6bt7SrIl4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570813392; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5UBXd47Rheba4Z2uwJ1iJ33C2hnZKrUbyLoPT0s2YYo=; b=jc5Z3NgA04/bGyVGR5qaT5kboYYEDDbwT0yrh6C+Cc/tzoNTFOghx8IfSNL0bQrf1+9q/UgQsDC3oRymTojBf2NIQa1sObSxk3zQicAcFloyId7NwtYFPnBlZmYUFkwkCrj4lUlBAUvIN4+qGSmJwetwN7ioPOyudhe6h0diZyo= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570813392772226.41606593369033; Fri, 11 Oct 2019 10:03:12 -0700 (PDT) Received: from localhost ([::1]:54298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIyJq-0006JG-SD for importer@patchew.org; Fri, 11 Oct 2019 13:03:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36995) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxRC-0006io-Js for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxR8-0004oh-Mz for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:42 -0400 Received: from relay.sw.ru ([185.231.240.75]:48486) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxR8-0004WR-Aj for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:38 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.2) (envelope-from ) id 1iIxQw-0003XG-2C; Fri, 11 Oct 2019 19:06:26 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 088/126] Cryptography: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:05:14 +0300 Message-Id: <20191011160552.22907-89-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191011160552.22907-1-vsementsov@virtuozzo.com> References: <20191011160552.22907-1-vsementsov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 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: Kevin Wolf , vsementsov@virtuozzo.com, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , armbru@redhat.com, Greg Kurz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" If we want to add some info to errp (by error_prepend() or error_append_hint()), we must use the ERRP_AUTO_PROPAGATE macro. Otherwise, this info will not be added when errp =3D=3D &fatal_err (the program will exit prior to the error_append_hint() or error_prepend() call). Fix such cases. If we want to check error after errp-function call, we need to introduce local_err and than propagate it to errp. Instead, use ERRP_AUTO_PROPAGATE macro, benefits are: 1. No need of explicit error_propagate call 2. No need of explicit local_err variable: use errp directly 3. ERRP_AUTO_PROPAGATE leaves errp as is if it's not NULL or &error_fatel, this means that we don't break error_abort (we'll abort on error_set, not on error_propagate) This commit (together with its neighbors) was generated by for f in $(git grep -l errp \*.[ch]); do \ spatch --sp-file scripts/coccinelle/auto-propagated-errp.cocci \ --macro-file scripts/cocci-macro-file.h --in-place --no-show-diff $f; \ done; then fix a bit of compilation problems: coccinelle for some reason leaves several f() { ... goto out; ... out: } patterns, with "out:" at function end. then ./python/commit-per-subsystem.py MAINTAINERS "$(< auto-msg)" (auto-msg was a file with this commit message) Still, for backporting it may be more comfortable to use only the first command and then do one huge commit. Reported-by: Kevin Wolf Reported-by: Greg Kurz Signed-off-by: Vladimir Sementsov-Ogievskiy --- crypto/block-luks.c | 56 +++++++++++++++++++-------------------------- crypto/secret.c | 17 ++++++-------- crypto/tlssession.c | 7 +++--- 3 files changed, 33 insertions(+), 47 deletions(-) diff --git a/crypto/block-luks.c b/crypto/block-luks.c index 4861db810c..45c21c2fcc 100644 --- a/crypto/block-luks.c +++ b/crypto/block-luks.c @@ -442,8 +442,8 @@ qcrypto_block_luks_store_header(QCryptoBlock *block, void *opaque, Error **errp) { + ERRP_AUTO_PROPAGATE(); const QCryptoBlockLUKS *luks =3D block->opaque; - Error *local_err =3D NULL; size_t i; g_autofree QCryptoBlockLUKSHeader *hdr_copy =3D NULL; =20 @@ -469,10 +469,9 @@ qcrypto_block_luks_store_header(QCryptoBlock *block, =20 /* Write out the partition header and key slot headers */ writefunc(block, 0, (const uint8_t *)hdr_copy, sizeof(*hdr_copy), - opaque, &local_err); + opaque, errp); =20 - if (local_err) { - error_propagate(errp, local_err); + if (*errp) { return -1; } return 0; @@ -603,9 +602,9 @@ qcrypto_block_luks_check_header(const QCryptoBlockLUKS = *luks, Error **errp) static int qcrypto_block_luks_parse_header(QCryptoBlockLUKS *luks, Error **errp) { + ERRP_AUTO_PROPAGATE(); g_autofree char *cipher_mode =3D g_strdup(luks->header.cipher_mode); char *ivgen_name, *ivhash_name; - Error *local_err =3D NULL; =20 /* * The cipher_mode header contains a string that we have @@ -632,17 +631,15 @@ qcrypto_block_luks_parse_header(QCryptoBlockLUKS *luk= s, Error **errp) ivhash_name++; =20 luks->ivgen_hash_alg =3D qcrypto_block_luks_hash_name_lookup(ivhas= h_name, - &local_= err); - if (local_err) { - error_propagate(errp, local_err); + errp); + if (*errp) { return -1; } } =20 luks->cipher_mode =3D qcrypto_block_luks_cipher_mode_lookup(cipher_mod= e, - &local_err); - if (local_err) { - error_propagate(errp, local_err); + errp); + if (*errp) { return -1; } =20 @@ -650,24 +647,21 @@ qcrypto_block_luks_parse_header(QCryptoBlockLUKS *luk= s, Error **errp) qcrypto_block_luks_cipher_name_lookup(luks->header.cipher_name, luks->cipher_mode, luks->header.master_key_= len, - &local_err); - if (local_err) { - error_propagate(errp, local_err); + errp); + if (*errp) { return -1; } =20 luks->hash_alg =3D qcrypto_block_luks_hash_name_lookup(luks->header.hash_spec, - &local_err); - if (local_err) { - error_propagate(errp, local_err); + errp); + if (*errp) { return -1; } =20 luks->ivgen_alg =3D qcrypto_block_luks_ivgen_name_lookup(ivgen_name, - &local_err); - if (local_err) { - error_propagate(errp, local_err); + errp); + if (*errp) { return -1; } =20 @@ -679,9 +673,8 @@ qcrypto_block_luks_parse_header(QCryptoBlockLUKS *luks,= Error **errp) luks->ivgen_cipher_alg =3D qcrypto_block_luks_essiv_cipher(luks->cipher_alg, luks->ivgen_hash_alg, - &local_err); - if (local_err) { - error_propagate(errp, local_err); + errp); + if (*errp) { return -1; } } else { @@ -1186,9 +1179,9 @@ qcrypto_block_luks_create(QCryptoBlock *block, void *opaque, Error **errp) { + ERRP_AUTO_PROPAGATE(); QCryptoBlockLUKS *luks; QCryptoBlockCreateOptionsLUKS luks_opts; - Error *local_err =3D NULL; g_autofree uint8_t *masterkey =3D NULL; size_t header_sectors; size_t split_key_sectors; @@ -1298,9 +1291,8 @@ qcrypto_block_luks_create(QCryptoBlock *block, luks->ivgen_cipher_alg =3D qcrypto_block_luks_essiv_cipher(luks_opts.cipher_alg, luks_opts.ivgen_hash_alg, - &local_err); - if (local_err) { - error_propagate(errp, local_err); + errp); + if (*errp) { goto error; } } else { @@ -1364,9 +1356,8 @@ qcrypto_block_luks_create(QCryptoBlock *block, luks->header.master_key_salt, QCRYPTO_BLOCK_LUKS_SALT_LEN, QCRYPTO_BLOCK_LUKS_DIGEST_LEN, - &local_err); - if (local_err) { - error_propagate(errp, local_err); + errp); + if (*errp) { goto error; } =20 @@ -1439,9 +1430,8 @@ qcrypto_block_luks_create(QCryptoBlock *block, block->sector_size; =20 /* Reserve header space to match payload offset */ - initfunc(block, block->payload_offset, opaque, &local_err); - if (local_err) { - error_propagate(errp, local_err); + initfunc(block, block->payload_offset, opaque, errp); + if (*errp) { goto error; } =20 diff --git a/crypto/secret.c b/crypto/secret.c index 1cf0ad0ce8..962d2c1d44 100644 --- a/crypto/secret.c +++ b/crypto/secret.c @@ -178,27 +178,25 @@ qcrypto_secret_prop_set_loaded(Object *obj, bool value, Error **errp) { + ERRP_AUTO_PROPAGATE(); QCryptoSecret *secret =3D QCRYPTO_SECRET(obj); =20 if (value) { - Error *local_err =3D NULL; uint8_t *input =3D NULL; size_t inputlen =3D 0; uint8_t *output =3D NULL; size_t outputlen =3D 0; =20 - qcrypto_secret_load_data(secret, &input, &inputlen, &local_err); - if (local_err) { - error_propagate(errp, local_err); + qcrypto_secret_load_data(secret, &input, &inputlen, errp); + if (*errp) { return; } =20 if (secret->keyid) { qcrypto_secret_decrypt(secret, input, inputlen, - &output, &outputlen, &local_err); + &output, &outputlen, errp); g_free(input); - if (local_err) { - error_propagate(errp, local_err); + if (*errp) { return; } input =3D output; @@ -206,10 +204,9 @@ qcrypto_secret_prop_set_loaded(Object *obj, } else { if (secret->format !=3D QCRYPTO_SECRET_FORMAT_RAW) { qcrypto_secret_decode(input, inputlen, - &output, &outputlen, &local_err); + &output, &outputlen, errp); g_free(input); - if (local_err) { - error_propagate(errp, local_err); + if (*errp) { return; } input =3D output; diff --git a/crypto/tlssession.c b/crypto/tlssession.c index 33203e8ca7..abb3912304 100644 --- a/crypto/tlssession.c +++ b/crypto/tlssession.c @@ -256,13 +256,13 @@ static int qcrypto_tls_session_check_certificate(QCryptoTLSSession *session, Error **errp) { + ERRP_AUTO_PROPAGATE(); int ret; unsigned int status; const gnutls_datum_t *certs; unsigned int nCerts, i; time_t now; gnutls_x509_crt_t cert =3D NULL; - Error *err =3D NULL; =20 now =3D time(NULL); if (now =3D=3D ((time_t)-1)) { @@ -354,9 +354,8 @@ qcrypto_tls_session_check_certificate(QCryptoTLSSession= *session, bool allow; =20 allow =3D qauthz_is_allowed_by_id(session->authzid, - session->peername, &err); - if (err) { - error_propagate(errp, err); + session->peername, errp); + if (*errp) { goto error; } if (!allow) { --=20 2.21.0