Skip to contentSkip to conversation

video: bmp: check coordinates of bitmap

PATCH New Yannick Fertré 2 participants 2 messages Oct 25, 2019 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 video: bmp: check coordinates of bitmap

If the coordinates are bigger than the size of
the panel then errors appear when calculating axis alignment and the copy of bitmap is done outside of framebuffer.

---
 drivers/video/video_bmp.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
drivers/video/video_bmp.c +13 -0
index 4af1fb4..74267f7 100644
@@ -256,6 +256,19 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y,
 		return -EINVAL;
 	}
 
+	/* check if coordinates exceeds panel size */
+	if (pwidth < x && x != BMP_ALIGN_CENTER) {
+		printf("Error: Coordinate x %d is bigger than panel width %d\n",
+		       (int)x, (int)pwidth);
+		return -EINVAL;
+	}
+
+	if (priv->ysize < y && y != BMP_ALIGN_CENTER) {
+		printf("Error: Coordinate y %d is bigger than panel height %d\n"
+		       , (int)y, (int)priv->ysize);
+		return -EINVAL;
+	}
+
 	if (align) {
 		video_splash_align_axis(&x, priv->xsize, width);
 		video_splash_align_axis(&y, priv->ysize, height);
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 video: bmp: check coordinates of bitmap

Quoted 14 lines · Yannick Fertré

If the coordinates are bigger than the size of
the panel then errors appear when calculating axis alignment and the copy of bitmap is done outside of framebuffer.

---
 drivers/video/video_bmp.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
drivers/video/video_bmp.c +0 -0
index 4af1fb4..74267f7 100644

drivers/video/video_bmp.c int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y, · line 258

Quoted 3 lines
drivers/video/video_bmp.c +0 -0
@@ -256,6 +256,19 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y,
 		return -EINVAL;
 	}
 

Below these lines that you are adding we already have code for clipping bitmaps that are too large:

          if ((x + width) > pwidth)
                  width = pwidth - x;
          if ((y + height) > priv->ysize)
                  height = priv->ysize - y;

Why is this not working in your case?

Clipping is preferable to creating error messages. So if something is wrong in the clipping logic this should be corrected.

Best regards

Heinrich

Quoted 17 lines
drivers/video/video_bmp.c +13 -0
+	/* check if coordinates exceeds panel size */
+	if (pwidth < x && x != BMP_ALIGN_CENTER) {
+		printf("Error: Coordinate x %d is bigger than panel width %d\n",
+		       (int)x, (int)pwidth);
+		return -EINVAL;
+	}
+
+	if (priv->ysize < y && y != BMP_ALIGN_CENTER) {
+		printf("Error: Coordinate y %d is bigger than panel height %d\n"
+		       , (int)y, (int)priv->ysize);
+		return -EINVAL;
+	}
+
 	if (align) {
 		video_splash_align_axis(&x, priv->xsize, width);
 		video_splash_align_axis(&y, priv->ysize, height);