From patchwork Wed Nov 24 17:03:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 72921 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4F999B70A7 for ; Thu, 25 Nov 2010 04:08:12 +1100 (EST) Received: from localhost ([127.0.0.1]:45583 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PLIpF-0007jL-Cw for incoming@patchwork.ozlabs.org; Wed, 24 Nov 2010 12:08:09 -0500 Received: from [140.186.70.92] (port=41823 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PLIl5-0007BD-EG for qemu-devel@nongnu.org; Wed, 24 Nov 2010 12:03:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PLIl4-0001S0-7S for qemu-devel@nongnu.org; Wed, 24 Nov 2010 12:03:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:15372) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PLIl3-0001Rk-UQ for qemu-devel@nongnu.org; Wed, 24 Nov 2010 12:03:50 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oAOH3nWG002655 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 24 Nov 2010 12:03:49 -0500 Received: from rincewind.home.kraxel.org (vpn2-11-125.ams2.redhat.com [10.36.11.125]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oAOH3khK006933; Wed, 24 Nov 2010 12:03:47 -0500 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id D5D4C4557D; Wed, 24 Nov 2010 18:03:45 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 24 Nov 2010 18:03:43 +0100 Message-Id: <1290618225-28879-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1290618225-28879-1-git-send-email-kraxel@redhat.com> References: <1290618225-28879-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 1/3] vnc: auth reject cleanup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org protocol_client_auth_vnc() has two places where the auth can fail, with identical code sending the reject message to the client. Move the common code to the end of the function and make both error paths jump there. No functional change. Signed-off-by: Gerd Hoffmann --- ui/vnc.c | 30 +++++++++++++----------------- 1 files changed, 13 insertions(+), 17 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 864342e..da70757 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -2085,15 +2085,7 @@ static int protocol_client_auth_vnc(VncState *vs, uint8_t *data, size_t len) if (!vs->vd->password || !vs->vd->password[0]) { VNC_DEBUG("No password configured on server"); - 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); - return 0; + goto reject; } memcpy(response, vs->challenge, VNC_AUTH_CHALLENGE_SIZE); @@ -2109,14 +2101,7 @@ static int protocol_client_auth_vnc(VncState *vs, uint8_t *data, size_t len) /* Compare expected vs actual challenge response */ if (memcmp(response, data, VNC_AUTH_CHALLENGE_SIZE) != 0) { VNC_DEBUG("Client challenge reponse did not match\n"); - 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); + goto reject; } else { VNC_DEBUG("Accepting VNC challenge response\n"); vnc_write_u32(vs, 0); /* Accept auth */ @@ -2125,6 +2110,17 @@ static int protocol_client_auth_vnc(VncState *vs, uint8_t *data, size_t len) start_client_init(vs); } 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); + return 0; } void start_auth_vnc(VncState *vs)