Skip to content

video/drm: bmp_helper: fix out-of-bounds write in RLE8 DELTA decoder #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
atkinchris wants to merge 1 commit into
base: next-dev
Choose a base branch
from
Open

video/drm: bmp_helper: fix out-of-bounds write in RLE8 DELTA decoder #100

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions drivers/video/drm/bmp_helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ static void decode_rle8_bitmap(void *psrc, void *pdst, uint16_t *cmap,
} else {
y++;
}
if (y < 0 || y >= height)
decode = 0;
break;
case BMP_RLE8_EOBMP:
/* end of bitmap */
Expand All @@ -95,12 +97,14 @@ static void decode_rle8_bitmap(void *psrc, void *pdst, uint16_t *cmap,
dst += bmap[2] * 2;
}
bmap += 4;
if (x >= width || y < 0 || y >= height)
decode = 0;
break;
default:
/* unencoded run */
runlen = bmap[1];
bmap += 2;
if (y >= height || x >= width) {
if (y < 0 || y >= height || x >= width) {
decode = 0;
break;
}
Expand All @@ -117,7 +121,7 @@ static void decode_rle8_bitmap(void *psrc, void *pdst, uint16_t *cmap,
}
} else {
/* encoded run */
if (y < height) {
if (y >= 0 && y < height) {
runlen = bmap[0];
if (x < width) {
/* aggregate the same code */
Expand Down