From nobody Tue Feb 10 03:44:37 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=1624896577; cv=none; d=zohomail.com; s=zohoarc; b=aBa7G0RN12WgQ5SNn9QZjiFOfQag+bIGW+oNoHUlCc7NRf4HEJ1bFr9IG7vTJ6ZV0VY34vEnQ6UDNK/p+Cz0Y63uvCpI3EDObKUg9BHiqZUz0BQKC/53NJM4VhTKdKxYKB1elKv7WLOBCFXX/0GKYsoPChz/wWdGc3/6uoQGVn0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624896577; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=VkLBHkfXJxaMXYLk4+jG0GG7cEqqzru53ecaYrh3wFE=; b=eWRnup5ttDw5MCgyYZnb4me+HqSLTbQn0IS9Z/EQgZtccKw5Q3swELIS7UQqL2SaRtzpo2ixJ6396tTa8MreM+bHG2832rbFLfVyNsR3VHESBgQL8YTT/4PYGYxj4FLyQ60QeLCziy4tS7HDgsK0k2BpKvY6aNmoWjx1azz9eow= 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 1624896577196201.80446683279922; Mon, 28 Jun 2021 09:09:37 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-18-KFkLjZnVNi28PyX9ZoQWiA-1; Mon, 28 Jun 2021 12:09:35 -0400 Received: by mail-wr1-f72.google.com with SMTP id l6-20020a0560000226b029011a80413b4fso4779553wrz.23 for ; Mon, 28 Jun 2021 09:09:34 -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 b15sm17739862wrr.27.2021.06.28.09.09.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 09:09:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624896576; 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=VkLBHkfXJxaMXYLk4+jG0GG7cEqqzru53ecaYrh3wFE=; b=LGiVfcyDhXrdF7RHGyXf0OsZqFL/CrerNk6wFYr1ZB8AD/puT7qbXOVPddB2DxlPmJtZdw R/9pkYKlkBD7J0bEeYxnSvPh9bCQXvkZpZ8qN+Ol4PsegiSqCa4ux1g5UmOM0ZOD+2UN3A 3aUr2zt4WwNGb6dZEK9JJ7L9YDhSkHE= X-MC-Unique: KFkLjZnVNi28PyX9ZoQWiA-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=VkLBHkfXJxaMXYLk4+jG0GG7cEqqzru53ecaYrh3wFE=; b=c7h1wSA/rGLG8dcDDTMixH00EuO/a3udwig1sdtsO7B4QS1iDyvK/Ws/uvggO7A1Uz 6AUNBqbIUX3z+Bk3yhb3HieufkDWIveH5XtEpNk5UT1XU7CpZD1+DYqT4cHLd4ao02oJ 5ZZfqe15lu3nezSWRf3BV+mc18AY+Wmra0esXdtQuk4muL0mqU8gcjkQh0hwoz/WQnrW OiTuNYVdRTx2Al1kXja3ut1DtedrBtphLY6SUkNIWQtYTlpjCpRfy+zHN50Ehv1KYtrm STyjkh52uJ/61ELn0w8gi1RFFQN+2/7uRj+PzS2UhUM7poJdcnRy4PZjQ/SNB2SXNpHA Bhlw== X-Gm-Message-State: AOAM533V7onHxvXxwp8h415P4O4BzylgRKV7X20KZlqA5Q65bEJ0VYXp 7D+qhtLpfbfxw5rtEWg4WjqCIgIzkxw99vjpzxZ4m5f2IdNHyKnwVLMJKp+SoCfMH1xCKtH3lpi 8U2XoP8hx38Ms1w== X-Received: by 2002:adf:ea45:: with SMTP id j5mr9030478wrn.230.1624896573706; Mon, 28 Jun 2021 09:09:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJze9c+nkYgCiUOvyNIiKvjttKE1+g7r/It7diSrKxB+4+qpY/jW6MRfRnzHmGzEqQbxNUU/YA== X-Received: by 2002:adf:ea45:: with SMTP id j5mr9030467wrn.230.1624896573601; Mon, 28 Jun 2021 09:09:33 -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?= , Richard Henderson Subject: [PATCH v6 4/7] chardev/socket: Use qcrypto_tls_creds_check_endpoint() Date: Mon, 28 Jun 2021 18:09:11 +0200 Message-Id: <20210628160914.2461906-5-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. Reviewed-by: Richard Henderson Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- chardev/char-socket.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index daa89fe5d1d..d0fb5459638 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -1402,18 +1402,12 @@ static void qmp_chardev_open_socket(Chardev *chr, return; } object_ref(OBJECT(s->tls_creds)); - if (is_listen) { - if (s->tls_creds->endpoint !=3D QCRYPTO_TLS_CREDS_ENDPOINT_SER= VER) { - error_setg(errp, "%s", - "Expected TLS credentials for server endpoint"); - return; - } - } else { - if (s->tls_creds->endpoint !=3D QCRYPTO_TLS_CREDS_ENDPOINT_CLI= ENT) { - error_setg(errp, "%s", - "Expected TLS credentials for client endpoint"); - return; - } + if (!qcrypto_tls_creds_check_endpoint(s->tls_creds, + is_listen + ? QCRYPTO_TLS_CREDS_ENDPOINT_SER= VER + : QCRYPTO_TLS_CREDS_ENDPOINT_CLI= ENT, + errp)) { + return; } } s->tls_authz =3D g_strdup(sock->tls_authz); --=20 2.31.1