shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: aspeed: Fix memory overwrite if timing is 1600x900

Browse Source 
commit c281355068 upstream.

When capturing 1600x900, system could crash when system memory usage is
tight.

The way to reproduce this issue:
1. Use 1600x900 to display on host
2. Mount ISO through 'Virtual media' on OpenBMC's web
3. Run script as below on host to do sha continuously
  #!/bin/bash
  while [ [1] ];
  do
	find /media -type f -printf '"%h/%f"\n' | xargs sha256sum
  done
4. Open KVM on OpenBMC's web

The size of macro block captured is 8x8. Therefore, we should make sure
the height of src-buf is 8 aligned to fix this issue.

Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Bin Lan <bin.lan.cn@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jammy Huang
2023-07-19 06:33:18 +00:00
committed by Greg Kroah-Hartman
parent 4a04ce0bc9
commit 4c823e4027
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/platform/aspeed/aspeed-video.c
View File

@@ -1047,7 +1047,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)
static void aspeed_video_set_resolution(struct aspeed_video *video) static void aspeed_video_set_resolution(struct aspeed_video *video)
{ {
struct v4l2_bt_timings *act = &video->active_timings; struct v4l2_bt_timings *act = &video->active_timings;
unsigned int size = act->width * act->height; unsigned int size = act->width * ALIGN(act->height, 8);
/* Set capture/compression frame sizes */ /* Set capture/compression frame sizes */
aspeed_video_calc_compressed_size(video, size); aspeed_video_calc_compressed_size(video, size);
@@ -1064,7 +1064,7 @@ static void aspeed_video_set_resolution(struct aspeed_video *video)
u32 width = ALIGN(act->width, 64); u32 width = ALIGN(act->width, 64);
aspeed_video_write(video, VE_CAP_WINDOW, width << 16 | act->height); aspeed_video_write(video, VE_CAP_WINDOW, width << 16 | act->height);
size = width * act->height; size = width * ALIGN(act->height, 8);
} else { } else {
aspeed_video_write(video, VE_CAP_WINDOW, aspeed_video_write(video, VE_CAP_WINDOW,
act->width << 16 | act->height); act->width << 16 | act->height);