summaryrefslogtreecommitdiffstats
path: root/server/red_parse_qxl.c
diff options
context:
space:
mode:
authorAlon Levy <alevy@redhat.com>2012-09-03 19:04:16 +0300
committerAlon Levy <alevy@redhat.com>2012-09-03 19:27:22 +0300
commit1c4e315e3e8261522d4944a75e4ca3917c505d2b (patch)
treeaee87b0d57b03b8e7a3131dbd0aa2e2aa071f43a /server/red_parse_qxl.c
parentf567f6b4cd696277fb48d7778d1aa0626f312d72 (diff)
downloadspice-1c4e315e3e8261522d4944a75e4ca3917c505d2b.tar.gz
spice-1c4e315e3e8261522d4944a75e4ca3917c505d2b.tar.xz
spice-1c4e315e3e8261522d4944a75e4ca3917c505d2b.zip
server/red_parse_qxl: add bitmap consistency check
Just checks stride vs width times bpp. This fixes a potential abort on guest generated bad images in glz_encoder. Other files touched to move some consts to red_common, they are static so no problem to be defined in both red_worker.c and red_parse_qxl.c .
Diffstat (limited to 'server/red_parse_qxl.c')
-rw-r--r--server/red_parse_qxl.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/server/red_parse_qxl.c b/server/red_parse_qxl.c
index bf577092..b893adda 100644
--- a/server/red_parse_qxl.c
+++ b/server/red_parse_qxl.c
@@ -21,6 +21,7 @@
#include <stdbool.h>
#include <inttypes.h>
+#include "common/lz_common.h"
#include "red_common.h"
#include "red_memslots.h"
#include "red_parse_qxl.h"
@@ -327,6 +328,19 @@ static SpiceChunks *red_get_image_data_chunked(RedMemSlotInfo *slots, int group_
return data;
}
+static int bitmap_consistent(SpiceBitmap *bitmap)
+{
+ int type = MAP_BITMAP_FMT_TO_LZ_IMAGE_TYPE[bitmap->format];
+ int bpp = RGB_BYTES_PER_PIXEL[type];
+
+ if (bitmap->stride < bitmap->x * bpp) {
+ spice_error("image stride too small for width: %d < %d * %d\n",
+ bitmap->stride, bitmap->x, bpp);
+ return FALSE;
+ }
+ return TRUE;
+}
+
// This is based on SPICE_BITMAP_FMT_*, copied from server/red_worker.c
// to avoid a possible unoptimization from making it non static.
static const int BITMAP_FMT_IS_RGB[] = {0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1};
@@ -382,6 +396,9 @@ static SpiceImage *red_get_image(RedMemSlotInfo *slots, int group_id,
red->u.bitmap.x = qxl->bitmap.x;
red->u.bitmap.y = qxl->bitmap.y;
red->u.bitmap.stride = qxl->bitmap.stride;
+ if (!bitmap_consistent(&red->u.bitmap)) {
+ goto error;
+ }
if (qxl->bitmap.palette) {
QXLPalette *qp;
int i, num_ents;