From nobody Mon Feb 9 16:02:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1624896596; cv=none; d=zohomail.com; s=zohoarc; b=YpP2YHEneA+ArwlulbVgCCvb1unMKDS5Hf8XweMHl9rW+7dT9ofzHoi6n3b61M3K7Ycnn+Wuj+R1J+k6aTbJ0yFIuIH9VE3+lFoFCmwIDq9W0z183mOghogtekaau4cI9x1LBVAVNetvp30RaI7VVu1OnTbZ+EE3z33acu78s/Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624896596; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=DfqYkwgTKKkxPbFVd5zilcJPjt9FG4DxuN+oPlFbvLM=; b=iznH0SoNjYKyzMAyd1i+qccUdTDOFaqw7Oc8idL0r0hi/cWeSO0RojrCmD8ERGZMDdaiG2FHTk/9JkcHT+ynedpR220AVMKhyx+O0R+wF29RKEpUhldvRFhnqeP5Pbd3p40uQCnJziqkzJEIdhhDPeMzm/88seLPtZx4fFuQ+zM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1624896596564174.63347354414645; Mon, 28 Jun 2021 09:09:56 -0700 (PDT) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-200-VHRkOhWON_-ito6jVr6HMQ-1; Mon, 28 Jun 2021 12:09:30 -0400 Received: by mail-wr1-f70.google.com with SMTP id a4-20020a0560001884b0290124b6e4a437so2934360wri.16 for ; Mon, 28 Jun 2021 09:09:30 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id n20sm13522750wmk.12.2021.06.28.09.09.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 09:09:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624896594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DfqYkwgTKKkxPbFVd5zilcJPjt9FG4DxuN+oPlFbvLM=; b=ijZP9HmmLhpIfOOgD7wb+C7Zmd2cb2MsS1q4vQYwNgGcC8zIxjsA6TN24hdrJYnINesLQd HSNgzN4coXT50NK5WEAR8UqHSDPOK9TUrj4nu5qeo2QS4lmurNRaFf6DILlal10J4n+Y6j iR4AHu+GUn3KbiT9yRpmOOlTQJCaEKU= X-MC-Unique: VHRkOhWON_-ito6jVr6HMQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DfqYkwgTKKkxPbFVd5zilcJPjt9FG4DxuN+oPlFbvLM=; b=quoyZBtQjgX2ZTk3rtJYgomDLl+sxEvypWR8UdDt98d5BHRuj9zbCc8SJkFgNQaHjf av3CWxHaB91qP/a+1WsIJDOKfdjCEaG16Vhs4aPsD+6AHrP5s0XxV68MRCrfQLcsCAzr /+IcjAX5IVy4/NoXnzp7DiUt3c/Mh6wDqJ5H3GdU1MGFpWck0V/s9DdHi2g8TvZUi+JJ j+bBZvgZIlsYbbIVMJkx+2mFadh1R0IQLGaFMcChnIOJd4puwXXpJjzVPlta5ihID8JW vCasNCBqLPwxlyNZTwZgQE2ScPeKL7uNw2ocS6kFc5sORccjxwIrBWi80hsGtj4cFS/B W08Q== X-Gm-Message-State: AOAM530dqGH1+A2He74zMSDqsMgj/kBAel2PG2rEM8yEqusXsyrXfKmj VxW0wbpU87lcOKOjZeaie0i9fmyIfsm/s/WPmGUW2w3BDNhd7+Z5VsZP5KAKvNqRVIo7oPhQFQp fSQ/NiqkUpZXvXg== X-Received: by 2002:a05:600c:4f15:: with SMTP id l21mr15918446wmq.72.1624896569346; Mon, 28 Jun 2021 09:09:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmwQff2AK0G9javFMNtow6PiB0Ulm5gL+u2Ag/NUUmes3l7f8/fAZf7Ml0Oi1KUlHk8DMRXA== X-Received: by 2002:a05:600c:4f15:: with SMTP id l21mr15918433wmq.72.1624896569235; Mon, 28 Jun 2021 09:09:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Akihiko Odaki , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 3/7] qemu-nbd: Use qcrypto_tls_creds_check_endpoint() Date: Mon, 28 Jun 2021 18:09:10 +0200 Message-Id: <20210628160914.2461906-4-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210628160914.2461906-1-philmd@redhat.com> References: <20210628160914.2461906-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Avoid accessing QCryptoTLSCreds internals by using the qcrypto_tls_creds_check_endpoint() helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Eric Blake Tested-by: Akihiko Odaki --- qemu-nbd.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/qemu-nbd.c b/qemu-nbd.c index 93ef4e288fd..26ffbf15af0 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -43,6 +43,7 @@ #include "io/channel-socket.h" #include "io/net-listener.h" #include "crypto/init.h" +#include "crypto/tlscreds.h" #include "trace/control.h" #include "qemu-version.h" =20 @@ -422,18 +423,12 @@ static QCryptoTLSCreds *nbd_get_tls_creds(const char = *id, bool list, return NULL; } =20 - if (list) { - if (creds->endpoint !=3D QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) { - error_setg(errp, - "Expecting TLS credentials with a client endpoint"); - return NULL; - } - } else { - if (creds->endpoint !=3D QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) { - error_setg(errp, - "Expecting TLS credentials with a server endpoint"); - return NULL; - } + if (!qcrypto_tls_creds_check_endpoint(creds, + list + ? QCRYPTO_TLS_CREDS_ENDPOINT_CLI= ENT + : QCRYPTO_TLS_CREDS_ENDPOINT_SER= VER, + errp)) { + return NULL; } object_ref(obj); return creds; --=20 2.31.1