Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Ming Qian <ming.qian@nxp.com>
To:     mchehab@kernel.org, mirela.rabulea@oss.nxp.com,
        hverkuil-cisco@xs4all.nl
Cc:     shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de,
        festevam@gmail.com, xiahong.bao@nxp.com, linux-imx@nxp.com,
        linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
        devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH] media: v4l2-jpeg: ignore the unknown APP14 marker
Date:   Fri, 16 Dec 2022 17:08:44 +0800
Message-Id: <20221216090844.27262-1-ming.qian@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9mJHvSqreidpihMCXrMKMrbV0fTauY8iMLzvXBWqhd5b8cTM87C2HF8/9UGg?=
 =?us-ascii?Q?7Ft12q6XLXQdh4ZhOiikrZbnZeRqV1TGcnrZiRcmC2Jrxyo7vAFoaZkKuFd/?=
 =?us-ascii?Q?Ib9m1ORY3Ydv4cCyNiZCVJ8elzqzQejdrj3cJch7Sz3fVT4L+jqFyvyThcOE?=
 =?us-ascii?Q?LSfdJlWQYhWNUrqY/a/qeBhQh8h0VshAUaSYr6TlHAlQhVR40BF21xW0P68c?=
 =?us-ascii?Q?VA4JNNQUAo589a3gUBptMC4hU22+ZwU6cCSqUCbA+cWwEwHkbnXYM2BK5yAa?=
 =?us-ascii?Q?/lHv0qnDmsLVl1vw/TeP7qbQKGqsTeAJp0Yibqt2mfVIwo9jYNwP8UT4/VIw?=
 =?us-ascii?Q?PbMt/p0/Uj3DYNOHVYy/HILZ5RgDrZZ28jzv7PPrhRHWC+KZFziiNiQ/L5SE?=
 =?us-ascii?Q?S4qAD+Sg5aHGsG4zuQBK8cce49tK41zM1jL/PKk1KTlAQPbo66TM8lkGCaAM?=
 =?us-ascii?Q?wdZEaMOY4xxrVbYKALu0RUP5M+7APZgxb6iY5sPRLUIxVmxp/jSiBNPFSdry?=
 =?us-ascii?Q?HFYXycfOJNGGP+gEXU5hrbpnlHIdHZhsjI7EfoDghQRAvA8Vk/Ho93EaXM0y?=
 =?us-ascii?Q?izgIRf2CitWIyh2EX0NtuNKpwEBEseuCsgEw19/7PqfrDLrpXLP5ulXYHLjI?=
 =?us-ascii?Q?XES0q7ukPX4Wjz+l1OYxlpDsVocIur/DiU24POjSHbI6lt0GI3hH4rBIIi6K?=
 =?us-ascii?Q?AZcTKBKPn9ZGQFFg45y6gh11vdOtalNGLVgKUousgEY8tUyNjSwZzmar4dWN?=
 =?us-ascii?Q?MHa/la67FGnzwKnRxc5RMQUIpQaCLdAWmj5dfX8b6mqrVirWcgAUK/TWqbXW?=
 =?us-ascii?Q?249bVVYINDDEnn8srrN+SrjgVfiK3WRXCkXhbtB4u/WAFvokxWMb+/jyjabG?=
 =?us-ascii?Q?bogPSS3WKBcFI7VaTaleNpbHDTOhrJ2i/7cW4/mxUOgA5nfgcUPhVV3m0yFN?=
 =?us-ascii?Q?d3gUrZI4WHWtPmWfdV6qxTdL2icAV5dFSmb9ttB5fyZwaTnL4PVjDDKreNRm?=
 =?us-ascii?Q?wZjPZRlEyQ09ICRqwz+WsaVoHXhxBRBmw6yvnoPGbmaQDWHp7Q9TU9vXgiPc?=
 =?us-ascii?Q?ZM3rY4APZn/iUZHQ7Z8Bw5itf5ZBBFtzHMJvkmr/tcyGxkXyrBkAOEm/bHLl?=
 =?us-ascii?Q?hHYrxtB7dKsi4BJfvcC/WYFGUnD7OKYJflkW5/mrgWzXqiNIUv2FHhLyYHey?=
 =?us-ascii?Q?uubIPLw4v3hpOy5YKKE6Rq3mKsXEUIhpvuGEUwEruRYlWknjZMVkS+A5qYEf?=
 =?us-ascii?Q?baQMPJr3t20c4rPByfjRe34m8fbmOQ1VR+o5W2hYa3kykNT3BaKM+mcmHJXz?=
 =?us-ascii?Q?4DWF1rjHH57fwWI+fgEZN18UI7K6zjJ9x0LPkFZ/JCBtaiO9CGtvYTAR9sRu?=
 =?us-ascii?Q?JP3fDAhw9GCkN8bbza75seYZw0Ym2skBbLfJhT3yhWxYntb36I9nYTClaqfx?=
 =?us-ascii?Q?t+FIprPfEXZZ4Oo+SKNOvOT+apdfHWoLNqyIclHMKvB2qiBK3t0d9AdrG3R9?=
 =?us-ascii?Q?CrXbyQ1Guqknsq8T/3u9Tw1H6lpxDNkxkh7YklVeYfLtWmB6CLxkt75YWhkP?=
 =?us-ascii?Q?07nGJANnd89TBWDTn0bJlRZkAZhK9uEruOIHxKxI?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 349a5f02-68e2-46c8-50ff-08dadf452eb1
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2022 09:09:05.8425
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: HAntSE0gWTp1k5iLMucdiVlD7KUVsXNY5lGWCg6nYkBKS9nqQS/hyWQOT2DFbI0pivUG4JsUCp/sV9eRYFukfA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8665
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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

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