From 375710483e6cc73df7276d6cfdf63dda8cbab5f2 Mon Sep 17 00:00:00 2001 From: Petr Matousek Date: Mon, 27 Oct 2014 12:41:44 +0100 Subject: [PATCH] vnc: sanitize bits_per_pixel from the client 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 Signed-off-by: Stefano Stabellini Conflicts: ui/vnc.c --- ui/vnc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ui/vnc.c b/ui/vnc.c index 40018f70f..46a9c888a 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1827,6 +1827,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->clientds = *(vs->vd->guest.ds); vs->clientds.pf.rmax = red_max; vs->clientds.pf.rbits = hweight_long(red_max); -- 2.39.5