From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2EB10C6FD1F for ; Wed, 3 Apr 2024 07:16:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 566AF112133; Wed, 3 Apr 2024 07:16:16 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=collabora.com header.i=@collabora.com header.b="hZ4AFfBi"; dkim-atps=neutral Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7478211213D for ; Wed, 3 Apr 2024 07:16:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1712128573; bh=sB1qXVz1eeVM+HiE6NVmhSVeeFBp77JSys4100PgG/c=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=hZ4AFfBiaybD4gNHpmJErMdrcwcqS1PLMMr9pe3w2AbqbnIU9CHUVLeOhOWtrKg1d arHlo10g5PTt84CLRkZ9VSgZGA7lAYpXcvn+nd5ACLCRILZWY8MtfT4gAQOdTGwUlT uKPBFg44xr2bz9DHR81h7BoVlwgnEmIxLZP+ZpJQOKhiAlKoklhhEN6hLBOkvqTgtz QXGN4vEDHTMKQ1iLGExShcvkHGYlWmhSawkO9+CM0hAE3FyHDjnx9/xxaybm6FfAnV +2RgsbWgwzYPzUbradSTD+x4UIDk2vPgFpNSoe2PDY/XhfeyTbZ2agya9TwUqPA4lZ DBkLatkYvfORA== Received: from localhost (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: bbrezillon) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 9DB3F37820F1; Wed, 3 Apr 2024 07:16:12 +0000 (UTC) Date: Wed, 3 Apr 2024 09:16:11 +0200 From: Boris Brezillon To: Dan Carpenter Cc: Steven Price , Liviu Dudau , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Heiko Stuebner , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH] drm/panthor: Fix off by one in panthor_fw_get_cs_iface() Message-ID: <20240403091611.7fa45916@collabora.com> In-Reply-To: <62835c16-c85c-483d-a8fe-63be78d49d15@moroto.mountain> References: <62835c16-c85c-483d-a8fe-63be78d49d15@moroto.mountain> Organization: Collabora X-Mailer: Claws Mail 4.2.0 (GTK 3.24.41; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, 2 Apr 2024 12:56:42 +0300 Dan Carpenter wrote: > The ->iface.streams[csg_slot][] array has MAX_CS_PER_CSG elements so > this > comparison needs to be >= to prevent an out of bounds access. > > Fixes: 2718d91816ee ("drm/panthor: Add the FW logical block") > Signed-off-by: Dan Carpenter Queued to drm-misc-next. Thanks, Boris > --- > drivers/gpu/drm/panthor/panthor_fw.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/panthor/panthor_fw.c b/drivers/gpu/drm/panthor/panthor_fw.c > index 33c87a59834e..181395e2859a 100644 > --- a/drivers/gpu/drm/panthor/panthor_fw.c > +++ b/drivers/gpu/drm/panthor/panthor_fw.c > @@ -308,7 +308,7 @@ panthor_fw_get_csg_iface(struct panthor_device *ptdev, u32 csg_slot) > struct panthor_fw_cs_iface * > panthor_fw_get_cs_iface(struct panthor_device *ptdev, u32 csg_slot, u32 cs_slot) > { > - if (drm_WARN_ON(&ptdev->base, csg_slot >= MAX_CSGS || cs_slot > MAX_CS_PER_CSG)) > + if (drm_WARN_ON(&ptdev->base, csg_slot >= MAX_CSGS || cs_slot >= MAX_CS_PER_CSG)) > return NULL; > > return &ptdev->fw->iface.streams[csg_slot][cs_slot];