ui/cursor: fix integer overflow in cursor_alloc (CVE-2021-4206)
PATCH v3 1/1 ui/cursor: fix integer overflow in cursor_alloc (CVE-2021-4206)
Prevent potential integer overflow by limiting 'width' and 'height' to 512x512. Also change 'datasize' type to size_t. Refer to security advisory https://starlabs.sg/advisories/22-4206/ for more information.
---
v3:
- fix CVE id (CVE-2021-4206 instead of CVE-2022-4206)
hw/display/qxl-render.c | 7 +++++++ hw/display/vmware_vga.c | 2 ++ ui/cursor.c | 8 +++++++- 3 files changed, 16 insertions(+), 1 deletion(-)
hw/display/qxl-render.c +7 -0
@@ -247,6 +247,13 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor,size_t size; c =cursor_alloc (cursor->header.width, cursor->header.height); + +if (!c) { +qxl_set_guest_bug (qxl,"%s: cursor %ux%u alloc error" , __func__, + cursor->header.width, cursor->header.height); + goto fail; + } + c->hot_x = cursor->header.hot_spot_x; c->hot_y = cursor->header.hot_spot_y;switch (cursor->header.type) {
hw/display/vmware_vga.c +2 -0
@@ -515,6 +515,8 @@ static inline void vmsvga_cursor_define(struct vmsvga_state_s *s,int i, pixels; qc =cursor_alloc (c->width, c->height); +assert (qc !=NULL ); + qc->hot_x = c->hot_x; qc->hot_y = c->hot_y;switch (c->bpp) {
ui/cursor.c +7 -1
@@ -46,6 +46,8 @@ static QEMUCursor *cursor_parse_xpm(const char *xpm[])/* parse pixel data */ c =cursor_alloc (width, height); +assert (c !=NULL ); +for (pixel =0 , y =0 ; y < height; y++, line++) {for (x =0 ; x < height; x++, pixel++) { idx = xpm[line][x];
@@ -91,7 +93,11 @@ QEMUCursor *cursor_builtin_left_ptr(void)QEMUCursor *cursor_alloc (int width,int height) {QEMUCursor *c; -int datasize = width * height *sizeof (uint32_t ); +size_t datasize = width * height *sizeof (uint32_t ); + +if (width >512 || height >512 ) { +return NULL ; + } c =g_malloc0 (sizeof (QEMUCursor) + datasize); c->width = width;
Signature · 1 line
2.35.1
Quoted 6 lines · Mauro Matteo Cascella
Prevent potential integer overflow by limiting 'width' and 'height' to 512x512. Also change 'datasize' type to
size_t. Refer to security advisory https://starlabs.sg/advisories/22-4206/ for more information.Fixes CVE-2021-4206
(the Starlabs advisory has 2022, I guess it's wrong then)
Quoted 1 line
Quoted 73 lines
---
v3:
- fix CVE id (CVE-2021-4206 instead of CVE-2022-4206)hw/display/qxl-render.c | 7 +++++++ hw/display/vmware_vga.c | 2 ++ ui/cursor.c | 8 +++++++- 3 files changed, 16 insertions(+), 1 deletion(-)hw/display/qxl-render.c +7
-0@@ -247,6 +247,13 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl,QXLCursor *cursor, size_t size; c =cursor_alloc (cursor->header.width, cursor->header.height); + +if (!c) { +qxl_set_guest_bug (qxl,"%s: cursor %ux%u alloc error" , __func__, + cursor->header.width, cursor->header.height); + goto fail; + } + c->hot_x = cursor->header.hot_spot_x; c->hot_y = cursor->header.hot_spot_y;switch (cursor->header.type) {hw/display/vmware_vga.c +2
-0@@ -515,6 +515,8 @@ static inline void vmsvga_cursor_define(structvmsvga_state_s *s, int i, pixels; qc =cursor_alloc (c->width, c->height); +assert (qc !=NULL ); + qc->hot_x = c->hot_x; qc->hot_y = c->hot_y;switch (c->bpp) {ui/cursor.c +7
-2@@ -46,6 +46,8 @@ static QEMUCursor *cursor_parse_xpm(const char *xpm[])/* parse pixel data */ c =cursor_alloc (width, height); +assert (c !=NULL ); +for (pixel =0 , y =0 ; y < height; y++, line++) {for (x =0 ; x < height; x++, pixel++) { idx = xpm[line][x];@@ -91,7 +93,11 @@ QEMUCursor *cursor_builtin_left_ptr(void)QEMUCursor *cursor_alloc (int width,int height) {QEMUCursor *c; -int datasize = width * height *sizeof (uint32_t ); +size_t datasize = width * height *sizeof (uint32_t ); + +if (width >512 || height >512 ) { +return NULL ; + } c =g_malloc0 (sizeof (QEMUCursor) + datasize); c->width = width; --2.35.1
Signature · 1 line
Marc-André Lureau
Quoted 5 lines · Marc-André Lureau
Quoted 1 line · Mauro Matteo Cascella
Quoted 8 lines
Quoted 5 lines
Prevent potential integer overflow by limiting 'width' and 'height' to 512x512. Also change 'datasize' type to
size_t. Refer to security advisory https://starlabs.sg/advisories/22-4206/ for more information.Fixes CVE-2021-4206(the Starlabs advisory has 2022, I guess it's wrong then)
Yep, that is wrong. I asked them to update the page.
Thanks.
Quoted 81 lines
Quoted 1 line
Signed-off-by Mauro Matteo Cascella <[email protected]>Reviewed-by Marc-André Lureau <[email protected]>Quoted 68 lines
---
v3:
- fix CVE id (CVE-2021-4206 instead of CVE-2022-4206)hw/display/qxl-render.c | 7 +++++++ hw/display/vmware_vga.c | 2 ++ ui/cursor.c | 8 +++++++- 3 files changed, 16 insertions(+), 1 deletion(-)hw/display/qxl-render.c +7
-0@@ -247,6 +247,13 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor,size_t size; c =cursor_alloc (cursor->header.width, cursor->header.height); + +if (!c) { +qxl_set_guest_bug (qxl,"%s: cursor %ux%u alloc error" , __func__, + cursor->header.width, cursor->header.height); + goto fail; + } + c->hot_x = cursor->header.hot_spot_x; c->hot_y = cursor->header.hot_spot_y;switch (cursor->header.type) {hw/display/vmware_vga.c +2
-0@@ -515,6 +515,8 @@ static inline void vmsvga_cursor_define(struct vmsvga_state_s *s,int i, pixels; qc =cursor_alloc (c->width, c->height); +assert (qc !=NULL ); + qc->hot_x = c->hot_x; qc->hot_y = c->hot_y;switch (c->bpp) {ui/cursor.c +7
-2@@ -46,6 +46,8 @@ static QEMUCursor *cursor_parse_xpm(const char *xpm[])/* parse pixel data */ c =cursor_alloc (width, height); +assert (c !=NULL ); +for (pixel =0 , y =0 ; y < height; y++, line++) {for (x =0 ; x < height; x++, pixel++) { idx = xpm[line][x];@@ -91,7 +93,11 @@ QEMUCursor *cursor_builtin_left_ptr(void)QEMUCursor *cursor_alloc (int width,int height) {QEMUCursor *c; -int datasize = width * height *sizeof (uint32_t ); +size_t datasize = width * height *sizeof (uint32_t ); + +if (width >512 || height >512 ) { +return NULL ; + } c =g_malloc0 (sizeof (QEMUCursor) + datasize); c->width = width; --Quoted 3 lines
2.35.1
--
Marc-André Lureau
Signature · 3 lines
Mauro Matteo Cascella Red Hat Product Security PGP-Key ID: BB3410B0
Quoted 12 lines · Marc-André Lureau
Quoted 6 lines · Mauro Matteo Cascella
Prevent potential integer overflow by limiting 'width' and 'height' to 512x512. Also change 'datasize' type to
size_t. Refer to security advisory https://starlabs.sg/advisories/22-4206/ for more information.Fixes CVE-2021-4206
Quoted 6 lines
(the Starlabs advisory has 2022, I guess it's wrong then)
Quoted 1 line
Signed-off-by Mauro Matteo Cascella <[email protected]>Reviewed-by Marc-André Lureau <[email protected]>
Does this fix (or any of the other cursor-related stuff I've seen floating past) need to go into 7.0 ? (ie is it release-critical?)
thanks
-- PMM
Quoted 16 lines · Peter Maydell
Quoted 14 lines · Marc-André Lureau
Quoted 6 lines · Mauro Matteo Cascella
Prevent potential integer overflow by limiting 'width' and 'height' to 512x512. Also change 'datasize' type to
size_t. Refer to security advisory https://starlabs.sg/advisories/22-4206/ for more information.Fixes CVE-2021-4206(the Starlabs advisory has 2022, I guess it's wrong then)
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Mauro Matteo Cascella <[email protected]>Reviewed-by Marc-André Lureau <[email protected]>Does this fix (or any of the other cursor-related stuff I've seen floating past) need to go into 7.0 ? (ie is it release-critical?)
Yes. The integer overflow can be triggered easily by guests. Hitting the double read race condition is harder but probably possible too. Pull request sent minutes ago.
take care,
Gerd