diff mbox series

media: v4l2-jpeg: ignore the unknown APP14 marker

Message ID 20221216090844.27262-1-ming.qian@nxp.com
State New
Headers
Series media: v4l2-jpeg: ignore the unknown APP14 marker |

Commit Message

Ming Qian Dec. 16, 2022, 9:08 a.m. UTC 
  The legal identifier of APP14 is "Adobe\0",
but sometimes it may be
"This is an unknown APP marker . Compliant decoders must ignore it."
In this case, just ignore it.
It won't affect the decode result.

Fixes: b8035f7988a8 ("media: Add parsing for APP14 data segment in jpeg helpers")
Signed-off-by: Ming Qian <ming.qian@nxp.com>
---
 drivers/media/v4l2-core/v4l2-jpeg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mirela Rabulea OSS Feb. 18, 2023, 9:50 p.m. UTC | #1 
Hi,

On 16.12.2022 11:08, Ming Qian wrote:
> The legal identifier of APP14 is "Adobe\0",
> but sometimes it may be
> "This is an unknown APP marker . Compliant decoders must ignore it."
> In this case, just ignore it.
> It won't affect the decode result.

I'm not sure, based on the specs only, what the decoders should do if 
the segment does not follow the definition.

I only found this in T.81:
"The APPn (Application) segments are reserved for application use. Since 
these segments may be defined differently for
different applications, they should be removed when the data are 
exchanged between application environments."

And in T.872, the mention about "Adobe\0".

But, I agree ignoring it is more robust, and I confirm imx-jpeg can 
decode such jpegs.

Reviewed-by: Mirela Rabulea <mirela.rabulea@nxp.com>

> 
> Fixes: b8035f7988a8 ("media: Add parsing for APP14 data segment in jpeg helpers")
> Signed-off-by: Ming Qian <ming.qian@nxp.com>
> ---
>   drivers/media/v4l2-core/v4l2-jpeg.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/media/v4l2-core/v4l2-jpeg.c b/drivers/media/v4l2-core/v4l2-jpeg.c
> index 75c2af763d55..94435a7b6816 100644
> --- a/drivers/media/v4l2-core/v4l2-jpeg.c
> +++ b/drivers/media/v4l2-core/v4l2-jpeg.c
> @@ -460,7 +460,7 @@ static int jpeg_parse_app14_data(struct jpeg_stream *stream,
>   	/* Check for "Adobe\0" in Ap1..6 */
>   	if (stream->curr + 6 > stream->end ||
>   	    strncmp(stream->curr, "Adobe\0", 6))
> -		return -EINVAL;
> +		return jpeg_skip(stream, lp - 2);
>   
>   	/* get to Ap12 */
>   	ret = jpeg_skip(stream, 11);
Mirela Rabulea OSS Feb. 18, 2023, 9:51 p.m. UTC | #2 
On 16.12.2022 11:08, Ming Qian wrote:
> The legal identifier of APP14 is "Adobe\0",
> but sometimes it may be
> "This is an unknown APP marker . Compliant decoders must ignore it."
> In this case, just ignore it.
> It won't affect the decode result.
> 
> Fixes: b8035f7988a8 ("media: Add parsing for APP14 data segment in jpeg helpers")
> Signed-off-by: Ming Qian <ming.qian@nxp.com>

Thanks,
Reviewed-by: Mirela Rabulea <mirela.rabulea@nxp.com>

> ---
>   drivers/media/v4l2-core/v4l2-jpeg.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/media/v4l2-core/v4l2-jpeg.c b/drivers/media/v4l2-core/v4l2-jpeg.c
> index 75c2af763d55..94435a7b6816 100644
> --- a/drivers/media/v4l2-core/v4l2-jpeg.c
> +++ b/drivers/media/v4l2-core/v4l2-jpeg.c
> @@ -460,7 +460,7 @@ static int jpeg_parse_app14_data(struct jpeg_stream *stream,
>   	/* Check for "Adobe\0" in Ap1..6 */
>   	if (stream->curr + 6 > stream->end ||
>   	    strncmp(stream->curr, "Adobe\0", 6))
> -		return -EINVAL;
> +		return jpeg_skip(stream, lp - 2);
>   
>   	/* get to Ap12 */
>   	ret = jpeg_skip(stream, 11);
diff mbox series

Patch

diff --git a/drivers/media/v4l2-core/v4l2-jpeg.c b/drivers/media/v4l2-core/v4l2-jpeg.c
index 75c2af763d55..94435a7b6816 100644
--- a/drivers/media/v4l2-core/v4l2-jpeg.c
+++ b/drivers/media/v4l2-core/v4l2-jpeg.c
@@ -460,7 +460,7 @@  static int jpeg_parse_app14_data(struct jpeg_stream *stream,
 	/* Check for "Adobe\0" in Ap1..6 */
 	if (stream->curr + 6 > stream->end ||
 	    strncmp(stream->curr, "Adobe\0", 6))
-		return -EINVAL;
+		return jpeg_skip(stream, lp - 2);
 
 	/* get to Ap12 */
 	ret = jpeg_skip(stream, 11);