From patchwork Thu Jan 26 15:06:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Verkuil X-Patchwork-Id: 89310 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1pL3qu-00A5da-QG; Thu, 26 Jan 2023 15:07:49 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232138AbjAZPHq (ORCPT + 1 other); Thu, 26 Jan 2023 10:07:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232193AbjAZPH2 (ORCPT ); Thu, 26 Jan 2023 10:07:28 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 630D36C13C for ; Thu, 26 Jan 2023 07:07:21 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 166E2B818D3 for ; Thu, 26 Jan 2023 15:07:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 06352C433EF; Thu, 26 Jan 2023 15:07:17 +0000 (UTC) From: Hans Verkuil To: linux-media@vger.kernel.org Cc: Hans Verkuil , Hugues Fruchet Subject: [PATCH 16/17] media: st: delta: introduce 'err_too_many_comps' label Date: Thu, 26 Jan 2023 16:06:56 +0100 Message-Id: <20230126150657.367921-17-hverkuil-cisco@xs4all.nl> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230126150657.367921-1-hverkuil-cisco@xs4all.nl> References: <20230126150657.367921-1-hverkuil-cisco@xs4all.nl> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,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: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.4 (--) X-LSpam-Report: No, score=-2.4 required=5.0 tests=BAYES_00=-1.9,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1 autolearn=ham autolearn_force=no The code mixed gotos and returns, which confused smatch. Add a err_too_many_comps label to handle the error instead of a return, this helps smatch understand the code, and it's a bit more consistent as well. This fixes this smatch warning: delta-mjpeg-hdr.c:67 delta_mjpeg_read_sof() warn: missing unwind goto? Signed-off-by: Hans Verkuil Cc: Hugues Fruchet --- .../platform/st/sti/delta/delta-mjpeg-hdr.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/st/sti/delta/delta-mjpeg-hdr.c b/drivers/media/platform/st/sti/delta/delta-mjpeg-hdr.c index 90e5b2f72c82..c132487637d3 100644 --- a/drivers/media/platform/st/sti/delta/delta-mjpeg-hdr.c +++ b/drivers/media/platform/st/sti/delta/delta-mjpeg-hdr.c @@ -59,13 +59,8 @@ static int delta_mjpeg_read_sof(struct delta_ctx *pctx, header->nb_of_components = *(u8 *)(data + offset); offset += sizeof(u8); - if (header->nb_of_components >= MJPEG_MAX_COMPONENTS) { - dev_err(delta->dev, - "%s unsupported number of components (%d > %d)\n", - pctx->name, header->nb_of_components, - MJPEG_MAX_COMPONENTS); - return -EINVAL; - } + if (header->nb_of_components >= MJPEG_MAX_COMPONENTS) + goto err_too_many_comps; if ((offset + header->nb_of_components * sizeof(header->components[0])) > size) @@ -78,6 +73,13 @@ static int delta_mjpeg_read_sof(struct delta_ctx *pctx, "%s sof: reached end of %d size input stream\n", pctx->name, size); return -ENODATA; + +err_too_many_comps: + dev_err(delta->dev, + "%s unsupported number of components (%d > %d)\n", + pctx->name, header->nb_of_components, + MJPEG_MAX_COMPONENTS); + return -EINVAL; } int delta_mjpeg_read_header(struct delta_ctx *pctx,