Re: [PATCH] media: v4l2-jpeg: ignore the unknown APP14 marker

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




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@xxxxxxx>

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

---
  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);



[Index of Archives]     [Device Tree Compilter]     [Device Tree Spec]     [Linux Driver Backports]     [Video for Linux]     [Linux USB Devel]     [Linux PCI Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Yosemite Backpacking]


  Powered by Linux