From nobody Mon Feb 9 15:27:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1623860607; cv=none; d=zohomail.com; s=zohoarc; b=iRA+uiUiiHhOABDhNXf1oLM1xzwy1ap1SKB5wB1GptQYPqhpSLCNfRl5YV1hu+JPjkpdOoPwO2s/dPI5IX9w94iV4nDXM4iGWcpvpuroVltqw3MTPEBQejG8uLIe5kntNbGw2uJi56c8MxdimrnUPQAa+hDuLbcKwSFHloT2hr4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623860607; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=k9Lp1hpOHTUDUkB6RWqmF0u0II8iRadKEZCA3yeM8Ts=; b=JXbSXZ04jP12qh/ohmrxceLBp1zzMqwOnc6yShAwjKCo1rOGpso4+4MGK8eJ+R/nfw7azwCrQFI9whoCg0FwVIGyxnLTr06HnhIakj9gRaEWyIchZ3oyv7z0n1qT6mmqfMUiMP/hRptfUF1Sz5UI83Sme4DImWDNd1RBuSxQ1Qg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1623860607725833.1578157707547; Wed, 16 Jun 2021 09:23:27 -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-445-4hT9HsUfOd6Oi1X1DIr90A-1; Wed, 16 Jun 2021 12:22:40 -0400 Received: by mail-wr1-f70.google.com with SMTP id q15-20020adfc50f0000b0290111f48b865cso1507561wrf.4 for ; Wed, 16 Jun 2021 09:22:40 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id v17sm3275382wrp.36.2021.06.16.09.22.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 09:22:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623860606; 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=k9Lp1hpOHTUDUkB6RWqmF0u0II8iRadKEZCA3yeM8Ts=; b=WeSvjPVg1LZffMhP11ZPPgl1gaAuT4O8VmWTkWgqRd/9NilfoEXBfknCNkKlklI8uFLIsm xS6ILIw5AYVK5UB2YLImIx08X7NNWRUrhdNjoSXWJghT5wsHQQKHMulBE3466ihMUpoDK6 /h+Kui8u+v2AioqkiRH1MVq2h1S60AU= X-MC-Unique: 4hT9HsUfOd6Oi1X1DIr90A-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=k9Lp1hpOHTUDUkB6RWqmF0u0II8iRadKEZCA3yeM8Ts=; b=sQEYUPPjHZygER10IcEYmeHYs8vJ1+bOwMSmQ0aKva+VDjkLv3cIBbKTpQ7Cfvg/jn vv4nHUFGo7N1QjLP2NvM6q80QGPWYyFfNWAtGT27rLCy0AQzLX6hdTDZ+q8jh64X3rCb 1lsGHYKmimijjoXdS3sSJPpUReJqQVIFeWvTXUOB6Hagom0KrPu+GH9sYp1UbWn/obL3 COrK9V5WcEYx4U1Iae0N7ZDoOJ8m8ODDId6NMmwvJZLXYB3+vF4g54XrHIH2V+AW6AwL jB1RvYoagj8YDbWUYUPufX7pa9T4n4NL9Sz7hdLPpuiIFGMhFBRSQd9wuJ2Q4MSrYZf/ m7pw== X-Gm-Message-State: AOAM531LmhZIHMNm7DOLplohRgR8eiYsPTSElQjcTc0Ym73p+mNq25gR Ifo4jNox+EdOctwmc4tnE6XDFMDMv3beAZKuLK6uOqWgCcZkZfxZhJ51CHvgqH/ugdma26+tLyY VEEAQk52C8D4nuQ== X-Received: by 2002:a1c:a785:: with SMTP id q127mr779523wme.152.1623860559586; Wed, 16 Jun 2021 09:22:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw2q0FNzByA2T8pqjfp3wFtkJ7fe8iaB43Gzj9lUVtPORVbvITlbcidS0lIJEAAHx9Mi1HBxA== X-Received: by 2002:a1c:a785:: with SMTP id q127mr779514wme.152.1623860559436; Wed, 16 Jun 2021 09:22:39 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 3/7] chardev/socket: Use qcrypto_tls_creds_check_endpoint() Date: Wed, 16 Jun 2021 18:22:21 +0200 Message-Id: <20210616162225.2517463-4-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616162225.2517463-1-philmd@redhat.com> References: <20210616162225.2517463-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: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson --- 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