From patchwork Tue Feb 14 10:28:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 56835 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2892228wrn; Tue, 14 Feb 2023 02:42:26 -0800 (PST) X-Google-Smtp-Source: AK7set91VaVL5KvRUXkwyEKMgt8T8IOvbVRvrTbDGcYWUX9eW08C6THaZRcimwXoiUch0bIh7Jjx X-Received: by 2002:a05:6a00:c84:b0:5a6:cbdc:2a1a with SMTP id a4-20020a056a000c8400b005a6cbdc2a1amr21485560pfv.2.1676371346273; Tue, 14 Feb 2023 02:42:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676371346; cv=none; d=google.com; s=arc-20160816; b=oaoqonVJ6bM9IHdYRM0lmED1n19nYRqTGRelwq/AJLFl4ftc5fqv98SmNpMvqwNncZ jgOYOxBhpNERzoYqzqQ5NSSC9NUOqy/u5Q/5sNVZQ9NayEjJYD3jdieZlCgHGSE4flvx 2tQPpi3cFevr2TzWuwmY1BXF4hTfheV/My8PC+lsXPfeKYuDX3S6vixZ6cWihIg1Ylil SLrZkuZ5/jj39IcoWMvpeH/jDY5feQg05xvOt2SzfiMRaKaVm4Jjom+5cUog7EleltAP oUEsGt6i3umPAK2FD+rVVaE9AW0wULnTOhCj3yxwwdOrMRW+gOvgIAO2L0PAQMH8V1wt 8qGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=6VNpymcgBgcVY+Hk0pgcDl5iBi69xGMKatjQMh6ptrU=; b=opbu5cf96H7M5OcUUQPHVUmMLmx0gKUJcvsuE0ByF7H/dUJppkuseDIRh7QZqdvOcj 6dvLFNuV/5fS6Ei4tacjGKDyPByjQtYlQczPoBYuuKWCOCaPJ2cZ/SOcJNnhzhhW/67A yNOmWrYAbV4K2nJuMcftWCw7o03D6vyKEMpsLVN26LzpM5biZM5jBs9AAj6PKuodF18N j5Fz/ZEraYmAq+L4sj7r1ea+88nObAJAwhL63ciUmsITCcyNmUr76kUkhZiZvhGgcsHF bLrJYyjgDgUdWRRvAiZViReSFum2WiqlARP2ue01fjISWYzF1qMpUH/a3O4dq/f98fOW a7bA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ru3vjApG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a27-20020aa794bb000000b005a8e948561fsi134545pfl.2.2023.02.14.02.42.13; Tue, 14 Feb 2023 02:42:26 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ru3vjApG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232381AbjBNK2g (ORCPT + 99 others); Tue, 14 Feb 2023 05:28:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229647AbjBNK2e (ORCPT ); Tue, 14 Feb 2023 05:28:34 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1FFC7222CC; Tue, 14 Feb 2023 02:28:34 -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 B73B2B81D02; Tue, 14 Feb 2023 10:28:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81045C433EF; Tue, 14 Feb 2023 10:28:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676370511; bh=VXmlpVfXufPNp5GbWFKiYEO94rbwAJ8jTU7CP3mRlNU=; h=From:To:Cc:Subject:Date:From; b=Ru3vjApGt+0QIZXiTYclPxmiljRyZE2ThkkptgivuodTb1QAE6MLtnssWQ23G+bIn H5YVd3tMvHWrPZycDwqAWFO7WIfzrb77OnyJOsXafqSstauuwOjwQDIz8G5elR0r/D FhsTzUGh7IlrqQYf2woOVpdc2kUJmWOXUuQBc6OTx12QqbENTovcV+uDPw32vffiAn 4YfSDeaEdRa63mc3tNOAyFM7zk82npNxUyIUrCz1b8uTZEAwCvIn2iLxlvQD1ecQg8 taS3ziI2sIqmtnqE/se3E/enPNNHvmOzPOLU0h3ZZIqu7yZd3JQJXc37M9YzEkDMz9 Z/SIrieSzHjtg== From: Arnd Bergmann To: Mirela Rabulea , Mauro Carvalho Chehab , Shawn Guo , Sascha Hauer , Hans Verkuil , Ming Qian Cc: Arnd Bergmann , NXP Linux Team , Pengutronix Kernel Team , Fabio Estevam , Laurent Pinchart , linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] media: imx-jpeg: avoid array overflow Date: Tue, 14 Feb 2023 11:28:20 +0100 Message-Id: <20230214102827.920927-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757802760477640157?= X-GMAIL-MSGID: =?utf-8?q?1757802760477640157?= From: Arnd Bergmann gcc-9 (unlike newer versions) reports a possible array overflow in mxc_jpeg_dec_irq(): drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c: In function 'mxc_jpeg_dec_irq': drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c:641:28: error: array subscript 2 is above array bounds of 'u32[2]' {aka 'unsigned int[2]'} [-Werror=array-bounds] 641 | size += q_data->sizeimage[i]; | ~~~~~~~~~~~~~~~~~^~~ drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c:641:28: error: array subscript 3 is above array bounds of 'u32[2]' {aka 'unsigned int[2]'} [-Werror=array-bounds] The compiler clearly deduces that fmt->mem_planes is at least '2' if this code line is reached, and that fmt->comp_planes must be at least one more for the loop to make sense. However, this does not actually seem to be the case in the initialized values, so I would guess that this part of the function is never reached in practice. As a workaround, add a compile-time condition that skips any out-of-range array indices. Fixes: ccc9f1db9c6b ("media: imx-jpeg: Support contiguous and non contiguous format") Signed-off-by: Arnd Bergmann --- drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c index f085f14d676a..7a667bfc2424 100644 --- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c +++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c @@ -638,7 +638,8 @@ static u32 mxc_jpeg_get_plane_size(struct mxc_jpeg_q_data *q_data, u32 plane_no) size = q_data->sizeimage[fmt->mem_planes - 1]; for (i = fmt->mem_planes; i < fmt->comp_planes; i++) - size += q_data->sizeimage[i]; + if (i < MXC_JPEG_MAX_PLANES) + size += q_data->sizeimage[i]; return size; }