From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37332) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xj4Uw-0002vp-RK for qemu-devel@nongnu.org; Tue, 28 Oct 2014 06:59:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xj4Uq-0005Ro-NE for qemu-devel@nongnu.org; Tue, 28 Oct 2014 06:59:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51499) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xj4Uq-0005Rh-Dl for qemu-devel@nongnu.org; Tue, 28 Oct 2014 06:59:28 -0400 From: Gerd Hoffmann Date: Tue, 28 Oct 2014 11:59:18 +0100 Message-Id: <1414493959-8310-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1414493959-8310-1-git-send-email-kraxel@redhat.com> References: <1414493959-8310-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 1/2] vnc: sanitize bits_per_pixel from the client List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Petr Matousek , Gerd Hoffmann , Anthony Liguori From: Petr Matousek bits_per_pixel that are less than 8 could result in accessing non-initialized buffers later in the code due to the expectation that bytes_per_pixel value that is used to initialize these buffers is never zero. To fix this check that bits_per_pixel from the client is one of the values that the rfb protocol specification allows. This is CVE-2014-7815. Signed-off-by: Petr Matousek [ kraxel: apply codestyle fix ] Signed-off-by: Gerd Hoffmann --- ui/vnc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ui/vnc.c b/ui/vnc.c index 0fe6eff..8bca597 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -2026,6 +2026,16 @@ static void set_pixel_format(VncState *vs, return; } + switch (bits_per_pixel) { + case 8: + case 16: + case 32: + break; + default: + vnc_client_error(vs); + return; + } + vs->client_pf.rmax = red_max; vs->client_pf.rbits = hweight_long(red_max); vs->client_pf.rshift = red_shift; -- 1.8.3.1