From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=48792 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzZEn-0001l5-R7 for qemu-devel@nongnu.org; Tue, 15 Mar 2011 14:44:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PzZEj-0006Mh-61 for qemu-devel@nongnu.org; Tue, 15 Mar 2011 14:44:57 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:52205) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PzZEi-0006Jo-OB for qemu-devel@nongnu.org; Tue, 15 Mar 2011 14:44:53 -0400 From: Stefan Weil Date: Tue, 15 Mar 2011 19:43:59 +0100 Message-Id: <1300214639-5539-1-git-send-email-weil@mail.berlios.de> Subject: [Qemu-devel] [PATCH STABLE 0.14] vnc: Limit r/w access to size of allocated memory List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori This fixes memory reads and writes which exceeded the upper limit of allocated memory vd->guest.ds->data and vd->server->data. Cc: Anthony Liguori Signed-off-by: Stefan Weil --- ui/vnc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index f4fea04..013f5e3 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -2273,6 +2273,9 @@ static int vnc_refresh_server_surface(VncDisplay *vd) */ vnc_set_bits(width_mask, (ds_get_width(vd->ds) / 16), VNC_DIRTY_WORDS); cmp_bytes = 16 * ds_get_bytes_per_pixel(vd->ds); + if (cmp_bytes > vd->ds->surface->linesize) { + cmp_bytes = vd->ds->surface->linesize; + } guest_row = vd->guest.ds->data; server_row = vd->server->data; for (y = 0; y < vd->guest.ds->height; y++) { -- 1.7.0.4