Merge "FROMGIT: media: venus: hfi: add a check to handle OOB in sfr region" into kernel.lnx.5.4.r1-rel

This commit is contained in:
Linux Build Service Account
2025-03-17 20:01:17 -07:00
committed by Gerrit - the friendly Code Review server

View File

@@ -976,18 +976,26 @@ static void venus_sfr_print(struct venus_hfi_device *hdev)
{
struct device *dev = hdev->core->dev;
struct hfi_sfr *sfr = hdev->sfr.kva;
u32 size;
void *p;
if (!sfr)
return;
p = memchr(sfr->data, '\0', sfr->buf_size);
size = sfr->buf_size;
if (!size)
return;
if (size > ALIGNED_SFR_SIZE)
size = ALIGNED_SFR_SIZE;
p = memchr(sfr->data, '\0', size);
/*
* SFR isn't guaranteed to be NULL terminated since SYS_ERROR indicates
* that Venus is in the process of crashing.
*/
if (!p)
sfr->data[sfr->buf_size - 1] = '\0';
sfr->data[size - 1] = '\0';
dev_err_ratelimited(dev, "SFR message from FW: %s\n", sfr->data);
}