* [PATCH v2] media: aspeed: Fix memory overwrite if timing is 1600x900
@ 2023-07-17 9:51 Jammy Huang
2023-07-19 6:18 ` Hans Verkuil
0 siblings, 1 reply; 4+ messages in thread
From: Jammy Huang @ 2023-07-17 9:51 UTC (permalink / raw)
To: eajames, mchehab, joel, andrew, linux-media, openbmc,
linux-arm-kernel, linux-aspeed, linux-kernel
Cc: Jammy Huang
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>
---
v2 changes
- Add how to reproduce this issue.
---
drivers/media/platform/aspeed/aspeed-video.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/aspeed/aspeed-video.c b/drivers/media/platform/aspeed/aspeed-video.c
index 374eb7781936..14594f55a77f 100644
--- a/drivers/media/platform/aspeed/aspeed-video.c
+++ b/drivers/media/platform/aspeed/aspeed-video.c
@@ -1130,7 +1130,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)
static void aspeed_video_set_resolution(struct aspeed_video *video)
{
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 */
aspeed_video_calc_compressed_size(video, size);
@@ -1147,7 +1147,7 @@ static void aspeed_video_set_resolution(struct aspeed_video *video)
u32 width = ALIGN(act->width, 64);
aspeed_video_write(video, VE_CAP_WINDOW, width << 16 | act->height);
- size = width * act->height;
+ size = width * ALIGN(act->height, 8);
} else {
aspeed_video_write(video, VE_CAP_WINDOW,
act->width << 16 | act->height);
base-commit: 2605e80d3438c77190f55b821c6575048c68268e
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] media: aspeed: Fix memory overwrite if timing is 1600x900
2023-07-17 9:51 [PATCH v2] media: aspeed: Fix memory overwrite if timing is 1600x900 Jammy Huang
@ 2023-07-19 6:18 ` Hans Verkuil
2023-07-19 6:29 ` Jammy Huang
0 siblings, 1 reply; 4+ messages in thread
From: Hans Verkuil @ 2023-07-19 6:18 UTC (permalink / raw)
To: Jammy Huang, eajames, mchehab, joel, andrew, linux-media,
openbmc, linux-arm-kernel, linux-aspeed, linux-kernel
Cc: Jammy Huang
Hi Jammy,
On 17/07/2023 11:51, Jammy Huang wrote:
> 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>
Your email address you sent this from differs from your SoB. Can you post
again from the correct email address? Checkpatch complains about this.
Regards,
Hans
> ---
> v2 changes
> - Add how to reproduce this issue.
> ---
> drivers/media/platform/aspeed/aspeed-video.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/aspeed/aspeed-video.c b/drivers/media/platform/aspeed/aspeed-video.c
> index 374eb7781936..14594f55a77f 100644
> --- a/drivers/media/platform/aspeed/aspeed-video.c
> +++ b/drivers/media/platform/aspeed/aspeed-video.c
> @@ -1130,7 +1130,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)
> static void aspeed_video_set_resolution(struct aspeed_video *video)
> {
> 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 */
> aspeed_video_calc_compressed_size(video, size);
> @@ -1147,7 +1147,7 @@ static void aspeed_video_set_resolution(struct aspeed_video *video)
> u32 width = ALIGN(act->width, 64);
>
> aspeed_video_write(video, VE_CAP_WINDOW, width << 16 | act->height);
> - size = width * act->height;
> + size = width * ALIGN(act->height, 8);
> } else {
> aspeed_video_write(video, VE_CAP_WINDOW,
> act->width << 16 | act->height);
>
> base-commit: 2605e80d3438c77190f55b821c6575048c68268e
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH v2] media: aspeed: Fix memory overwrite if timing is 1600x900
2023-07-19 6:18 ` Hans Verkuil
@ 2023-07-19 6:29 ` Jammy Huang
2023-07-19 6:33 ` [PATCH RESEND " Jammy Huang
0 siblings, 1 reply; 4+ messages in thread
From: Jammy Huang @ 2023-07-19 6:29 UTC (permalink / raw)
To: Hans Verkuil, Jammy Huang, eajames, mchehab, joel, andrew,
linux-media, openbmc, linux-arm-kernel, linux-aspeed,
linux-kernel
Hi Hans,
ASPEED's mail server had some problem these days. I will try to resend the patch.
Thank you.
On 2023/7/19 下午 02:18, Hans Verkuil wrote:
> Hi Jammy,
>
> On 17/07/2023 11:51, Jammy Huang wrote:
>> 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>
>
> Your email address you sent this from differs from your SoB. Can you post
> again from the correct email address? Checkpatch complains about this.
>
> Regards,
>
> Hans
>
>> ---
>> v2 changes
>> - Add how to reproduce this issue.
>> ---
>> drivers/media/platform/aspeed/aspeed-video.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/media/platform/aspeed/aspeed-video.c b/drivers/media/platform/aspeed/aspeed-video.c
>> index 374eb7781936..14594f55a77f 100644
>> --- a/drivers/media/platform/aspeed/aspeed-video.c
>> +++ b/drivers/media/platform/aspeed/aspeed-video.c
>> @@ -1130,7 +1130,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)
>> static void aspeed_video_set_resolution(struct aspeed_video *video)
>> {
>> 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 */
>> aspeed_video_calc_compressed_size(video, size);
>> @@ -1147,7 +1147,7 @@ static void aspeed_video_set_resolution(struct aspeed_video *video)
>> u32 width = ALIGN(act->width, 64);
>>
>> aspeed_video_write(video, VE_CAP_WINDOW, width << 16 | act->height);
>> - size = width * act->height;
>> + size = width * ALIGN(act->height, 8);
>> } else {
>> aspeed_video_write(video, VE_CAP_WINDOW,
>> act->width << 16 | act->height);
>>
>> base-commit: 2605e80d3438c77190f55b821c6575048c68268e
>
--
Best Regards
Jammy
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH RESEND v2] media: aspeed: Fix memory overwrite if timing is 1600x900
2023-07-19 6:29 ` Jammy Huang
@ 2023-07-19 6:33 ` Jammy Huang
0 siblings, 0 replies; 4+ messages in thread
From: Jammy Huang @ 2023-07-19 6:33 UTC (permalink / raw)
To: Hans Verkuil, eajames, mchehab, joel, andrew, linux-media,
openbmc, linux-arm-kernel, linux-aspeed, linux-kernel
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>
---
v2 changes
- Add how to reproduce this issue.
---
drivers/media/platform/aspeed/aspeed-video.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/aspeed/aspeed-video.c b/drivers/media/platform/aspeed/aspeed-video.c
index 374eb7781936..14594f55a77f 100644
--- a/drivers/media/platform/aspeed/aspeed-video.c
+++ b/drivers/media/platform/aspeed/aspeed-video.c
@@ -1130,7 +1130,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)
static void aspeed_video_set_resolution(struct aspeed_video *video)
{
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 */
aspeed_video_calc_compressed_size(video, size);
@@ -1147,7 +1147,7 @@ static void aspeed_video_set_resolution(struct aspeed_video *video)
u32 width = ALIGN(act->width, 64);
aspeed_video_write(video, VE_CAP_WINDOW, width << 16 | act->height);
- size = width * act->height;
+ size = width * ALIGN(act->height, 8);
} else {
aspeed_video_write(video, VE_CAP_WINDOW,
act->width << 16 | act->height);
base-commit: 2605e80d3438c77190f55b821c6575048c68268e
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-07-19 6:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-17 9:51 [PATCH v2] media: aspeed: Fix memory overwrite if timing is 1600x900 Jammy Huang
2023-07-19 6:18 ` Hans Verkuil
2023-07-19 6:29 ` Jammy Huang
2023-07-19 6:33 ` [PATCH RESEND " Jammy Huang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).