From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
To: Dikshita Agarwal <quic_dikshita@quicinc.com>,
Vikash Garodia <quic_vgarodia@quicinc.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Hans Verkuil <hverkuil@xs4all.nl>
Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org,
Vedang Nagar <quic_vnagar@quicinc.com>
Subject: Re: [PATCH v4 1/2] media: venus: Add a check for packet size after reading from shared memory
Date: Mon, 19 May 2025 11:55:14 +0100 [thread overview]
Message-ID: <88f6fea5-89f2-4128-a00b-dff760bc42b8@linaro.org> (raw)
In-Reply-To: <20250519-venus-fixes-v4-1-3ae91d81443d@quicinc.com>
On 19/05/2025 08:12, Dikshita Agarwal wrote:
> From: Vedang Nagar <quic_vnagar@quicinc.com>
>
> Add a check to ensure that the packet size does not exceed the number of
> available words after reading the packet header from shared memory. This
> ensures that the size provided by the firmware is safe to process and
> prevent potential out-of-bounds memory access.
>
> Fixes: d96d3f30c0f2 ("[media] media: venus: hfi: add Venus HFI files")
> Signed-off-by: Vedang Nagar <quic_vnagar@quicinc.com>
> Co-developed-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
> Signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
> ---
> drivers/media/platform/qcom/venus/hfi_venus.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c
> index b5f2ea8799507f9b83f1529e70061ea89a9cc5c8..c982f4527bb0b9f9ef9715c6c1dc26729f0fc079 100644
> --- a/drivers/media/platform/qcom/venus/hfi_venus.c
> +++ b/drivers/media/platform/qcom/venus/hfi_venus.c
> @@ -239,6 +239,7 @@ static int venus_write_queue(struct venus_hfi_device *hdev,
> static int venus_read_queue(struct venus_hfi_device *hdev,
> struct iface_queue *queue, void *pkt, u32 *tx_req)
> {
> + struct hfi_pkt_hdr *pkt_hdr = NULL;
> struct hfi_queue_header *qhdr;
> u32 dwords, new_rd_idx;
> u32 rd_idx, wr_idx, type, qsize;
> @@ -304,6 +305,9 @@ static int venus_read_queue(struct venus_hfi_device *hdev,
> memcpy(pkt, rd_ptr, len);
> memcpy(pkt + len, queue->qmem.kva, new_rd_idx << 2);
> }
> + pkt_hdr = (struct hfi_pkt_hdr *)(pkt);
> + if ((pkt_hdr->size >> 2) != dwords)
> + return -EINVAL;
> } else {
> /* bad packet received, dropping */
> new_rd_idx = qhdr->write_idx;
>
Yes, validating the pkt header against the expected/used dwords is a
valid check.
One thing I'm finding difficult to do with this code is get straight in
my head why we are continuously shifting >> 2 and then in the other
direction << 2
Surely a candidate fragment for some rationalisation down to
dwords = *rd_ptr >> 2;
if (!dwords >> 2)
return -EBAD;
I count six shifts in twenty LOC or at least four shifts more than we
should be doing if we just worked this over a bit.
Anyway.
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
next prev parent reply other threads:[~2025-05-19 10:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-19 7:12 [PATCH v4 0/2] venus driver fixes for vulnerabilities due to unexpected firmware payload Dikshita Agarwal
2025-05-19 7:12 ` [PATCH v4 1/2] media: venus: Add a check for packet size after reading from shared memory Dikshita Agarwal
2025-05-19 10:55 ` Bryan O'Donoghue [this message]
2025-05-19 7:12 ` [PATCH v4 2/2] media: venus: Fix OOB read due to missing payload bound check Dikshita Agarwal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=88f6fea5-89f2-4128-a00b-dff760bc42b8@linaro.org \
--to=bryan.odonoghue@linaro.org \
--cc=hverkuil@xs4all.nl \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=quic_dikshita@quicinc.com \
--cc=quic_vgarodia@quicinc.com \
--cc=quic_vnagar@quicinc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®