From: Mirela Rabulea <mirela.rabulea@oss.nxp.com>
To: mchehab@kernel.org, hverkuil-cisco@xs4all.nl,
shawnguo@kernel.org, robh+dt@kernel.org, p.zabel@pengutronix.de
Cc: paul.kocialkowski@bootlin.com, linux-media@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-imx@nxp.com,
s.hauer@pengutronix.de, aisheng.dong@nxp.com,
daniel.baluta@nxp.com, robert.chiras@nxp.com,
laurentiu.palcu@nxp.com, mark.rutland@arm.com,
devicetree@vger.kernel.org, ezequiel@collabora.com,
laurent.pinchart+renesas@ideasonboard.com,
niklas.soderlund+renesas@ragnatech.se,
dafna.hirschfeld@collabora.com
Subject: [PATCH v8 7/9] media: Quit parsing stream if doesn't start with SOI
Date: Mon, 22 Feb 2021 21:07:36 +0200 [thread overview]
Message-ID: <20210222190738.2346378-8-mirela.rabulea@oss.nxp.com> (raw)
In-Reply-To: <20210222190738.2346378-1-mirela.rabulea@oss.nxp.com>
From: Mirela Rabulea <mirela.rabulea@nxp.com>
In the case we get an invalid stream, such as from v4l2-compliance
streaming test, jpeg_next_marker will end up parsing the entire
stream. The standard describes the high level syntax of a jpeg
as starting with SOI, ending with EOI, so return error if the very
first 2 bytes are not SOI.
Signed-off-by: Mirela Rabulea <mirela.rabulea@nxp.com>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
---
drivers/media/v4l2-core/v4l2-jpeg.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-jpeg.c b/drivers/media/v4l2-core/v4l2-jpeg.c
index ede40f2a5456..c4c0d6dd4577 100644
--- a/drivers/media/v4l2-core/v4l2-jpeg.c
+++ b/drivers/media/v4l2-core/v4l2-jpeg.c
@@ -503,11 +503,8 @@ int v4l2_jpeg_parse_header(void *buf, size_t len, struct v4l2_jpeg_header *out)
out->num_dht = 0;
out->num_dqt = 0;
- /* the first marker must be SOI */
- marker = jpeg_next_marker(&stream);
- if (marker < 0)
- return marker;
- if (marker != SOI)
+ /* the first bytes must be SOI, B.2.1 High-level syntax */
+ if (jpeg_get_word_be(&stream) != SOI)
return -EINVAL;
/* init value to signal if this marker is not present */
--
2.25.1
next prev parent reply other threads:[~2021-02-22 19:17 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-22 19:07 [PATCH v8 0/9] Add V4L2 driver for i.MX8 JPEG Encoder/Decoder Mirela Rabulea
2021-02-22 19:07 ` [PATCH v8 1/9] media: v4l: Add packed YUV444 24bpp pixel format Mirela Rabulea
2021-02-22 19:07 ` [PATCH v8 2/9] media: dt-bindings: Add bindings for i.MX8QXP/QM JPEG driver Mirela Rabulea
2021-02-22 19:07 ` [PATCH v8 3/9] media: imx-jpeg: Add V4L2 driver for i.MX8 JPEG Encoder/Decoder Mirela Rabulea
2021-02-22 20:42 ` kernel test robot
2021-03-03 21:59 ` kernel test robot
2021-02-22 19:07 ` [PATCH v8 4/9] arm64: dts: imx8qxp: Add jpeg encoder/decoder nodes Mirela Rabulea
2021-02-22 19:07 ` [PATCH v8 5/9] Add maintainer for IMX jpeg v4l2 driver Mirela Rabulea
2021-02-22 19:07 ` [PATCH v8 6/9] media: Add parsing for APP14 data segment in jpeg helpers Mirela Rabulea
2021-02-22 19:07 ` Mirela Rabulea [this message]
2021-02-22 19:07 ` [PATCH v8 8/9] media: Avoid parsing quantization and huffman tables Mirela Rabulea
2021-02-22 19:07 ` [PATCH v8 9/9] media: imx-jpeg: Use v4l2 jpeg helpers in mxc-jpeg Mirela Rabulea
2021-02-22 21:59 ` kernel test robot
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=20210222190738.2346378-8-mirela.rabulea@oss.nxp.com \
--to=mirela.rabulea@oss.nxp.com \
--cc=aisheng.dong@nxp.com \
--cc=dafna.hirschfeld@collabora.com \
--cc=daniel.baluta@nxp.com \
--cc=devicetree@vger.kernel.org \
--cc=ezequiel@collabora.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=laurent.pinchart+renesas@ideasonboard.com \
--cc=laurentiu.palcu@nxp.com \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mchehab@kernel.org \
--cc=niklas.soderlund+renesas@ragnatech.se \
--cc=p.zabel@pengutronix.de \
--cc=paul.kocialkowski@bootlin.com \
--cc=robert.chiras@nxp.com \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).