From patchwork Wed May 22 18:42:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 164881 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1251411ili; Wed, 22 May 2019 12:25:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqwDdy5XktZqEBZknmiJSWD8sZZY8nXPGcVpQzJsDrK1yPDSYhj/E6Amb9y8NQqEcopY6LBW X-Received: by 2002:a17:906:a94c:: with SMTP id hh12mr20911885ejb.143.1558553152479; Wed, 22 May 2019 12:25:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558553152; cv=none; d=google.com; s=arc-20160816; b=ulKwZ6TB1JI8yp/HlLufKz4p/0G5WiVz0PtZzm/tmGWfIV6EbTkLlngl0hPQ22uTaw gzLsmv/2bD369RXL1t9VTl5jTK1rg1q1N4D5m4rCy3aorYfDZJH1/rUJCA9CPO7jyDK1 0UKjS4LqopVggZrIAOamnyQ7R2vi7TT/S4OXaKGW07Ybz3GEVn9EKvczr3Oyr0r1/j27 vlqXTimEjThdJhqEdMuP01jHihMJu/DA3GmGFqLjFhHTuYPLh3D8zD+0OnVGMgphkmyM Jp+jSXmKSTla5PaKmBi4fFgCnPbwdHLhgg/ddXVYQ8nBhJZdCY45/OtZfrBeeGz4Sy4P 3S0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=zQEKMjfpCTDyJlIECnLYp610ugeuDB8/XWCLVFEbpkI=; b=l2z7mq/sowiXZ4T9MunbhDcnt50u5kTax3oBDt9HAyjsSSH3WIjO8bLqwBOeok1eD0 ujR7Mc+mxTfldhKBEMQvVETqG32Ls9WTltKVrxredi77ellCdoROg0sbdXReSk8XckiS MNiwfBHPEwM1th20DCjn8mdwHUEjy6dLsBjAKIFchnx9DfqmPtcqPV5pQTImbwEU5irm iAFBBnxjstHM1GvA1xqf0LIeeichRf7dxa8QDjtOKaG96Q3bYpG+qIGav1ev8YPvcJX6 OYxysYzlDO/3wUODUfxQTVP6bb/SruAnL5oBqXBPHOyFrC2B3WBqieZVz89Fq17zVS5i eKGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=buz8zzBW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g4si6153978ejw.305.2019.05.22.12.25.52 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 22 May 2019 12:25:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=buz8zzBW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:50100 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTWs3-0001yS-AX for patch@linaro.org; Wed, 22 May 2019 15:25:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTWOr-0008Ga-9t for qemu-devel@nongnu.org; Wed, 22 May 2019 14:55:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTWCE-00084h-NJ for qemu-devel@nongnu.org; Wed, 22 May 2019 14:42:39 -0400 Received: from mail-yw1-xc42.google.com ([2607:f8b0:4864:20::c42]:44705) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTWCE-00084B-3Y for qemu-devel@nongnu.org; Wed, 22 May 2019 14:42:38 -0400 Received: by mail-yw1-xc42.google.com with SMTP id e74so1231751ywe.11 for ; Wed, 22 May 2019 11:42:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zQEKMjfpCTDyJlIECnLYp610ugeuDB8/XWCLVFEbpkI=; b=buz8zzBW8+fGmmxjgk6pFxcVeQ8mDCKNmPovFUaM5dBh/03FFMZjutDleauPoWTv/h mXNxnUnWPNz5+cVELkiJIume8PzXHMBxXFzV64XzAbeh/zWa5AIpQZv+g+8lTgsLV/Gi 5Fmb+blYFCyvDeiYLS3DVPGNB+E13l185tUTd+OZec6mij4suQ+JLUp8H84RRmWIDOYm j1Wef8H501WCFHlOyUeb5XQCizrHz/0wphr5Gxvk08qWPKM8dXYsJp9F7MNAm4hBE5iq nouCjgqzMxg6L+5BElqCvwHuvZH12nB0ZWp2IuZS2EyHXJjgKps2e2qCioX7oKoHQBJl 1ejQ== 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=zQEKMjfpCTDyJlIECnLYp610ugeuDB8/XWCLVFEbpkI=; b=MTXNrx1wqW//qUi7fzgyfPxY/HdlLlSw6Uo3Y9+YRor57Xa1IJ+ASrAqgKcGwD7jAi aM2eMTxKvMLYNHAfeEomhCPFbp6Hr1UcIEQoYUYGrP7EUrOdqYc/U8pKFFRyV0EDmcp0 e5EOaYUMkXJ08HgQCKg+FN+obMNjPcPMdgPwB++aSInujdBOG4w7XSIPxflNqw16Wij4 ehgCFAApDaW2lfMNnutAQabBIV04X3OswIHZoSHLfohQwTWCOrasQUFHYwoWJb8YlqAP knHqQElH5kosnGtQ+RsqLEuMmNTuqAg1X2VHvjKspBmOH5A6kIzfZw+zvPsKLztd7MEd iy/g== X-Gm-Message-State: APjAAAWqi6DvMslHa4By23f0eZNXcElNbJ1m5/cysITlLPFveCglA/Fw NoTMm6PUVZrMOT7K/f/bwv3a2ELxOFk= X-Received: by 2002:a0d:e584:: with SMTP id o126mr25630935ywe.81.1558550557014; Wed, 22 May 2019 11:42:37 -0700 (PDT) Received: from localhost.localdomain ([71.46.56.17]) by smtp.gmail.com with ESMTPSA id 206sm1299445ywq.74.2019.05.22.11.42.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 May 2019 11:42:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 22 May 2019 14:42:09 -0400 Message-Id: <20190522184226.17871-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190522184226.17871-1-richard.henderson@linaro.org> References: <20190522184226.17871-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::c42 Subject: [Qemu-devel] [PULL 08/25] ui/vnc: Split out authentication_failed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" There were 3 copies of this code, one of which used the wrong data size for the failure indicator. Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Gerd Hoffmann Reviewed-by: Daniel P. Berrangé Signed-off-by: Richard Henderson --- ui/vnc.c | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) -- 2.17.1 diff --git a/ui/vnc.c b/ui/vnc.c index 1871422e1d..785edf3af1 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -2535,6 +2535,18 @@ void start_client_init(VncState *vs) vnc_read_when(vs, protocol_client_init, 1); } +static void authentication_failed(VncState *vs) +{ + vnc_write_u32(vs, 1); /* Reject auth */ + if (vs->minor >= 8) { + static const char err[] = "Authentication failed"; + vnc_write_u32(vs, sizeof(err)); + vnc_write(vs, err, sizeof(err)); + } + vnc_flush(vs); + vnc_client_error(vs); +} + static void make_challenge(VncState *vs) { int i; @@ -2609,14 +2621,7 @@ static int protocol_client_auth_vnc(VncState *vs, uint8_t *data, size_t len) return 0; reject: - vnc_write_u32(vs, 1); /* Reject auth */ - if (vs->minor >= 8) { - static const char err[] = "Authentication failed"; - vnc_write_u32(vs, sizeof(err)); - vnc_write(vs, err, sizeof(err)); - } - vnc_flush(vs); - vnc_client_error(vs); + authentication_failed(vs); qcrypto_cipher_free(cipher); return 0; } @@ -2638,13 +2643,7 @@ static int protocol_client_auth(VncState *vs, uint8_t *data, size_t len) * must pick the one we sent. Verify this */ if (data[0] != vs->auth) { /* Reject auth */ trace_vnc_auth_reject(vs, vs->auth, (int)data[0]); - vnc_write_u32(vs, 1); - if (vs->minor >= 8) { - static const char err[] = "Authentication failed"; - vnc_write_u32(vs, sizeof(err)); - vnc_write(vs, err, sizeof(err)); - } - vnc_client_error(vs); + authentication_failed(vs); } else { /* Accept requested auth */ trace_vnc_auth_start(vs, vs->auth); switch (vs->auth) { @@ -2673,13 +2672,7 @@ static int protocol_client_auth(VncState *vs, uint8_t *data, size_t len) default: /* Should not be possible, but just in case */ trace_vnc_auth_fail(vs, vs->auth, "Unhandled auth method", ""); - vnc_write_u8(vs, 1); - if (vs->minor >= 8) { - static const char err[] = "Authentication failed"; - vnc_write_u32(vs, sizeof(err)); - vnc_write(vs, err, sizeof(err)); - } - vnc_client_error(vs); + authentication_failed(vs); } } return 0;