From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9Gzu-00041Z-Hh for qemu-devel@nongnu.org; Thu, 08 Jan 2015 12:36:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y9Gzl-0006jQ-4u for qemu-devel@nongnu.org; Thu, 08 Jan 2015 12:35:50 -0500 Received: from e31.co.us.ibm.com ([32.97.110.149]:56756) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9Gzk-0006ib-8m for qemu-devel@nongnu.org; Thu, 08 Jan 2015 12:35:40 -0500 Received: from /spool/local by e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 8 Jan 2015 10:35:39 -0700 From: Michael Roth Date: Thu, 8 Jan 2015 11:33:54 -0600 Message-Id: <1420738472-23267-51-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1420738472-23267-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1420738472-23267-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 50/88] 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: qemu-stable@nongnu.org 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 (cherry picked from commit e6908bfe8e07f2b452e78e677da1b45b1c0f6829) Signed-off-by: Michael Roth --- ui/vnc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ui/vnc.c b/ui/vnc.c index f8d9b7d..87e34ae 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.9.1