From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34751) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7i72-0007eY-Om for qemu-devel@nongnu.org; Wed, 14 Mar 2012 02:55:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7i6i-0007ik-FH for qemu-devel@nongnu.org; Wed, 14 Mar 2012 02:55:08 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:44335) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7i6h-0007hl-Ro for qemu-devel@nongnu.org; Wed, 14 Mar 2012 02:54:48 -0400 From: Corentin Chary Date: Wed, 14 Mar 2012 07:58:48 +0100 Message-Id: <1331708328-21414-3-git-send-email-corentincj@iksaif.net> In-Reply-To: <1331708328-21414-1-git-send-email-corentincj@iksaif.net> References: <1331708328-21414-1-git-send-email-corentincj@iksaif.net> Subject: [Qemu-devel] [PATCH 2/2] vnc: Limit r/w access to size of allocated memory List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Peter Lieven , qemu-devel@nongnu.org, kvm@vger.kernel.org, weil@mail.berlios.de From: Stefan Weil 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 aef6d3a..deb9ecd 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -2562,6 +2562,9 @@ static int vnc_refresh_server_surface(VncDisplay *vd) * Update server dirty map. */ 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.3.4